From aba0792c5858b3a2a8970985d3694bca0d603604 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 27 十二月 2024 17:47:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_timer/src/main/resources/application-self.yml | 83 ++++++++
server/visits/dmvisit_service/src/main/resources/application-pro.yml | 2
server/meeting/meeting_service/src/main/resources/application-self.yml | 73 +++++++
server/system_gateway/src/main/resources/application-self.yml | 39 +++
server/visits/admin_timer/src/main/resources/bootstrap-self.yml | 35 +++
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 2
server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 3
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/resources/application-self.yml | 54 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 3
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 73 +++++++
server/system_timer/src/main/resources/bootstrap.yml | 2
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 3
server/system_gateway/pom.xml | 6
server/system_gateway/src/main/resources/bootstrap-pro.yml | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 4
server/system_gateway/src/main/resources/bootstrap-self.yml | 95 +++++++++
server/system_timer/src/main/resources/bootstrap-self.yml | 28 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 4
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 40 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java | 1
admin/.env.development | 6
server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 3
23 files changed, 553 insertions(+), 12 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 799a00b..affed23 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,8 +1,8 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-# VUE_APP_API_URL = 'http://192.168.0.103:10010'
+# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
+ VUE_APP_API_URL = 'http://localhost:10010'
# VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
-# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
+ #VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index 1fac801..52ec77e 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -29,6 +29,8 @@
@Value("${swagger.host:}")
private String host;
+ @Value("${swagger.enabled:}")
+ private Boolean enabled;
@Value("${swagger.title:鎺ュ彛鏂囨。}")
private String title;
@@ -64,6 +66,7 @@
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.getApiInfo()).groupName("default")
.host(host)
+ .enable(enabled)
.select()
.apis( basePackage("com.doumee.cloud;com.doumee.api.common"))
// 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
new file mode 100644
index 0000000..8223992
--- /dev/null
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -0,0 +1,40 @@
+spring:
+ cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
+ nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
+ config:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit_dev
+# namespace: dev_renkang
+ username: nacos
+ password: nacos
+# file-extension: yaml
+# group: dev
+# data-id: com.doumee.meeting.admin
+ discovery:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# namespace: dev_renkang
+ namespace: dmvisit
+ username: nacos
+ password: nacos
+ # 瀹夊叏閰嶇疆
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
+ main:
+ allow-circular-references: true
+# Swagger閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index e322970..3407346 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: meetingAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_service/src/main/resources/application-self.yml b/server/meeting/meeting_service/src/main/resources/application-self.yml
new file mode 100644
index 0000000..879a779
--- /dev/null
+++ b/server/meeting/meeting_service/src/main/resources/application-self.yml
@@ -0,0 +1,73 @@
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Titi@168.com
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+#rocketmq:
+# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
+# groupId: GID-wakatest
+# topic: waka-test
+# username: 4derRb4Sw5EkqUMI
+# password: v50N97wf4av8Q8I4
+#
+#knife4j:
+# enable: true
+# basic:
+# enable: true
+# username: admin
+# password: 111111
+
+debug_model: true
+captcha_check: false
+
+# Swagger閰嶇疆
+swagger:
+ host:
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+ pay:
+ appId: wxfab6da18632e28de
+ appSecret: 4ee3b22afa90287834319fc3c1635271
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
+ keyPath: /usr/local/apiclient_cert.p12
+
+tencent:
+ map:
+ remoteHost: https://apis.map.qq.com
+ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+
+########################瀹氭椂寮�鍚厤缃�########################
+timing: true
+
+des_pwd: 123456SDFKDJF
+
+## MQTT##
+mqtt:
+ host: tcp://192.168.10.198:1883
+ userName: root
+ passWord: 123456
+ qos: 1
+ clientId: ClientId_local #ClientId_local蹇呴』鍞竴 姣斿浣犲凡缁忓畾浜嗗彨ABC 閭ｄ綘灏变竴鐩村彨ABC 鍏朵粬鍦版柟灏变笉瑕佷娇鐢ˋBC浜�
+ timeout: 10
+ keepalive: 20
+ topic1: A/pick/warn/# #绗﹀彿鏄唬琛ㄦ暣涓獁arn涓嬮潰鐨勫叏閮ㄥ瓙涓婚 娌℃湁鐞嗚В鐨勮瘽 鍙互鐧惧害浠旂粏鐞嗚В涓�涓�
+ topic2: A/cmd/resp
+ topic3: ABCF
+ topic4: ABCH
diff --git a/server/system_gateway/pom.xml b/server/system_gateway/pom.xml
index 969e452..267400e 100644
--- a/server/system_gateway/pom.xml
+++ b/server/system_gateway/pom.xml
@@ -79,6 +79,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
+ <finalName>system_gateway</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index 07e9c82..a04545a 100644
--- a/server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -28,6 +28,8 @@
@Value("${swagger.host:}")
private String host;
+ @Value("${swagger.enabled:}")
+ private Boolean enabled;
@Value("${swagger.title:鎺ュ彛鏂囨。}")
private String title;
@@ -51,6 +53,7 @@
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.getApiInfo()).groupName("default")
.host(host)
+ .enable(enabled)
.select()
.apis( basePackage("com.doumee.api.gateway;"))
// 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
diff --git a/server/system_gateway/src/main/resources/application-self.yml b/server/system_gateway/src/main/resources/application-self.yml
new file mode 100644
index 0000000..26ca5d9
--- /dev/null
+++ b/server/system_gateway/src/main/resources/application-self.yml
@@ -0,0 +1,39 @@
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Titi@168.com
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+
+
+debug_model: true
+
+captcha_check: false
+
+# Swagger閰嶇疆
+swagger:
+ host:
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 123456
+ main:
+ allow-circular-references: true
+timing: true
+
+des_pwd: 123456SDFKDJF
diff --git a/server/system_gateway/src/main/resources/bootstrap-pro.yml b/server/system_gateway/src/main/resources/bootstrap-pro.yml
index 2254fe4..d6eb6d1 100644
--- a/server/system_gateway/src/main/resources/bootstrap-pro.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -56,13 +56,13 @@
# 鑱氬悎swagger鏂囨。
gateway:
# 绗竴涓厤缃紝寮�鍚痝ateway鑱氬悎缁勪欢
- enabled: true
+ enabled: false
# 绗簩琛岄厤缃紝璁剧疆鑱氬悎妯″紡閲囩敤discover鏈嶅姟鍙戠幇鐨勬ā寮�
strategy: discover
# 鏈嶅姟鍙戠幇妯″紡鐨勯厤缃�
discover:
# 绗笁琛岄厤缃紝寮�鍚痙iscover妯″紡
- enabled: true
+ enabled: false
# 鑱氬悎鎵�鏈夊瓙鏈嶅姟(swagger2瑙勮寖)锛屽瓙鏈嶅姟鏄�3瑙勮寖鍒欐浛鎹负openapi3
version: swagger2
# 闇�瑕佹帓闄ょ殑寰湇鍔�(eg:缃戝叧鏈嶅姟)
diff --git a/server/system_gateway/src/main/resources/bootstrap-self.yml b/server/system_gateway/src/main/resources/bootstrap-self.yml
new file mode 100644
index 0000000..87a1d83
--- /dev/null
+++ b/server/system_gateway/src/main/resources/bootstrap-self.yml
@@ -0,0 +1,95 @@
+spring:
+ cloud:
+ nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
+ discovery:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# namespace: dmvisit
+ namespace: dmvisit_dev
+ username: nacos
+ password: nacos
+ gateway:
+ discovery:
+ locator:
+ #寮�鍚粠娉ㄥ唽涓績鍔ㄦ�佸垱寤鸿矾鐢辩殑鍔熻兘锛屽埄鐢ㄥ井鏈嶅姟鍚嶈繘琛岃矾鐢�
+ enabled: true
+ #寮�鍚皬鍐欓獙璇侊紝榛樿feign鏍规嵁鏈嶅姟鍚嶆煡鎵鹃兘鏄敤鐨勫叏澶у啓
+ lower-case-service-id: true
+ routes:
+ - id: meetingAdmin
+ name: 浼氳瀹ゅ井鏈嶅姟
+ uri: lb://meetingAdmin
+ # 鏂█,璺緞鐩稿尮閰嶇殑杩涜璺敱
+ predicates:
+ - Path=/meetingAdmin/**
+ filters:
+ - SwaggerHeaderFilter
+ - StripPrefix=1
+ - id: visitsAdmin
+ uri: lb://visitsAdmin
+ name: 璁垮绯荤粺寰湇鍔�
+ # 鏂█,璺緞鐩稿尮閰嶇殑杩涜璺敱
+ predicates:
+ - Path=/visitsAdmin/**
+ filters:
+ - SwaggerHeaderFilter
+ - StripPrefix=1
+ - id: systemTimer
+ uri: lb://systemTimer
+ name: 瀹氭椂浠诲姟寰湇鍔�
+ # 鏂█,璺緞鐩稿尮閰嶇殑杩涜璺敱
+ predicates:
+ - Path=/systemTimer/**
+ filters:
+ - SwaggerHeaderFilter
+ - StripPrefix=1
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+
+
+knife4j:
+
+ # 鑱氬悎swagger鏂囨。
+ gateway:
+ # 绗竴涓厤缃紝寮�鍚痝ateway鑱氬悎缁勪欢
+ enabled: true
+ # 绗簩琛岄厤缃紝璁剧疆鑱氬悎妯″紡閲囩敤discover鏈嶅姟鍙戠幇鐨勬ā寮�
+ strategy: discover
+ # 鏈嶅姟鍙戠幇妯″紡鐨勯厤缃�
+ discover:
+ # 绗笁琛岄厤缃紝寮�鍚痙iscover妯″紡
+ enabled: true
+ # 鑱氬悎鎵�鏈夊瓙鏈嶅姟(swagger2瑙勮寖)锛屽瓙鏈嶅姟鏄�3瑙勮寖鍒欐浛鎹负openapi3
+ version: swagger2
+ # 闇�瑕佹帓闄ょ殑寰湇鍔�(eg:缃戝叧鏈嶅姟)
+ excluded-services:
+ - gateway-service
+
+# Api鏂囨。淇℃伅
+# springdoc-openapi 椤圭洰閰嶇疆
+springdoc:
+ swagger-ui:
+ path: /doc.html
+ tags-sorter: alpha
+ operations-sorter: alpha
+ api-docs:
+ path: /v2/api-docs
+ group-configs:
+ - group: 'default'
+ paths-to-match: '/**'
+ info:
+ title: ${spring.application.name} - API
+ version: 3.0.0
+ description: 鎺ュ彛鏂囨。
+ contact:
+ name: 1
+ url: 1
+ email: 1
+ license:
+ name: Apache 2.0
+ url: https://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 8ecd0a5..7a7cd02 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: self
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index c2c35b0..78d342e 100644
--- a/server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -28,6 +28,8 @@
@Value("${swagger.host:}")
private String host;
+ @Value("${swagger.enabled:}")
+ private Boolean enabled;
@Value("${swagger.title:鎺ュ彛鏂囨。}")
private String title;
@@ -51,6 +53,7 @@
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.getApiInfo()).groupName("default")
.host(host)
+ .enable(enabled)
.select()
.apis( basePackage("com.doumee.api.timer;"))
// 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
diff --git a/server/system_timer/src/main/resources/application-self.yml b/server/system_timer/src/main/resources/application-self.yml
new file mode 100644
index 0000000..fa12a17
--- /dev/null
+++ b/server/system_timer/src/main/resources/application-self.yml
@@ -0,0 +1,83 @@
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Titi@168.com
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+#rocketmq:
+# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
+# groupId: GID-wakatest
+# topic: waka-test
+# username: 4derRb4Sw5EkqUMI
+# password: v50N97wf4av8Q8I4
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+# username: admin
+# password: 111111
+
+debug_model: true
+
+########################鍚屾鏁版嵁妯″紡 ########################
+data-sync:
+ org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
+
+
+# Swagger閰嶇疆
+swagger:
+ host: 127.0.0.1
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ context-path:
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+ pay:
+ appId: wxfab6da18632e28de
+ appSecret: 4ee3b22afa90287834319fc3c1635271
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
+ keyPath: /usr/local/apiclient_cert.p12
+
+tencent:
+ map:
+ remoteHost: https://apis.map.qq.com
+ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+
+
+des_pwd: 123456SDFKDJF
+
+## MQTT##
+mqtt:
+ host: tcp://192.168.10.198:1883
+ userName: root
+ passWord: 123456
+ qos: 1
+ clientId: ClientId_local #ClientId_local蹇呴』鍞竴 姣斿浣犲凡缁忓畾浜嗗彨ABC 閭ｄ綘灏变竴鐩村彨ABC 鍏朵粬鍦版柟灏变笉瑕佷娇鐢ˋBC浜�
+ timeout: 10
+ keepalive: 20
+ topic1: A/pick/warn/# #绗﹀彿鏄唬琛ㄦ暣涓獁arn涓嬮潰鐨勫叏閮ㄥ瓙涓婚 娌℃湁鐞嗚В鐨勮瘽 鍙互鐧惧害浠旂粏鐞嗚В涓�涓�
+ topic2: A/cmd/resp
+ topic3: ABCF
+ topic4: ABCH
diff --git a/server/system_timer/src/main/resources/bootstrap-self.yml b/server/system_timer/src/main/resources/bootstrap-self.yml
new file mode 100644
index 0000000..93754ac
--- /dev/null
+++ b/server/system_timer/src/main/resources/bootstrap-self.yml
@@ -0,0 +1,28 @@
+spring:
+ cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
+ nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
+ # config:
+ # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # namespace: dmvisit
+ # username: nacos
+ # password: nacos
+ # file-extension: yaml
+ # group: dev
+ # data-id: com.doumee.meeting.admin
+ discovery:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit_dev
+ username: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 05a83ce..87d835c 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: self
application:
name: systemTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
new file mode 100644
index 0000000..47fd25c
--- /dev/null
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
@@ -0,0 +1,35 @@
+spring:
+ cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
+ nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
+# config:
+# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# namespace: dmvisit
+# username: nacos
+# password: nacos
+# file-extension: yaml
+# group: dev
+# data-id: com.doumee.meeting.admin
+ discovery:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit
+ username: nacos
+ password: nacos
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index eff6a72..f98a73c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -31,6 +31,8 @@
@Value("${swagger.title:鎺ュ彛鏂囨。}")
private String title;
+ @Value("${swagger.enabled:}")
+ private Boolean enabled;
@Value("${swagger.description:}")
private String description;
@@ -51,6 +53,7 @@
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(this.getApiInfo()).groupName("default")
.host(host)
+ .enable(enabled)
.select()
.apis( basePackage("com.doumee.cloud"))
// .apis( basePackage("com.doumee.api.common"))
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
new file mode 100644
index 0000000..e752bff
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
@@ -0,0 +1,73 @@
+spring:
+ cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
+ nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
+# config:
+# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# namespace: dmvisit
+# username: nacos
+# password: nacos
+# file-extension: yaml
+# group: dev
+# data-id: com.doumee.meeting.admin
+ discovery:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# namespace: dmvisit
+ namespace: dmvisit_dev
+ username: nacos
+ password: nacos
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
+# swagger閰嶇疆
+#knife4j:
+# # 寮�鍚寮洪厤缃�
+# enable: true
+# # 寮�鍚敓浜х幆澧冨睆钄�
+# # production: true
+# setting:
+# language: zh_cn
+# # 璐︽埛瀵嗙爜
+# basic:
+# enable: true
+# username: abc
+# password: abc
+#
+## Api鏂囨。淇℃伅
+## springdoc-openapi 椤圭洰閰嶇疆
+#springdoc:
+# swagger-ui:
+# path: /doc.html
+# tags-sorter: alpha
+# operations-sorter: alpha
+# api-docs:
+# path: /v3/api-docs
+# group-configs:
+# - group: 'default'
+# paths-to-match: '/**'
+# info:
+# title: ${spring.application.name} - API
+# version: 3.0.0
+# description: 鎺ュ彛鏂囨。
+# contact:
+# name: 1
+# url: 1
+# email: 1
+# license:
+# name: Apache 2.0
+# url: https://www.apache.org/licenses/LICENSE-2.0.html
+
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 21db23c..fcc9683 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -819,7 +819,9 @@
* @return
*/
public static String ruleEventSearch(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,body);
+ Map<String,String> header = new HashMap<>();
+ header.put("User-Id","admin");
+ return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,null,header,body);
}
/**
* 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
index d0dde64..2fc6b25 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
@@ -8,5 +8,6 @@
public class FireStatisticResponse {
private Integer maintenanceNum ;// Number false 宸茬淮淇濈殑娑堥槻璁惧鏁�
+ private Integer maintenanceNumMonth ;// Number false 鏈湀鏂板宸茬淮淇濈殑娑堥槻璁惧鏁�
private Integer deviceTotalNum ;// Number false 娑堥槻璁惧鎬绘暟
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 7bb3f9e..1313475 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1198,10 +1198,10 @@
BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response1.getData()!=null ) {
- data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNum()));
+ data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
}
- return data;
+ return data;
}
diff --git a/server/visits/dmvisit_service/src/main/resources/application-pro.yml b/server/visits/dmvisit_service/src/main/resources/application-pro.yml
index 262a314..50bbec0 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-pro.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-pro.yml
@@ -17,7 +17,7 @@
date-format: yyyy-MM-dd HH:mm:ss
-debug_model: true
+debug_model: false
########################鍚屾鏁版嵁妯″紡 ########################
data-sync:
diff --git a/server/visits/dmvisit_service/src/main/resources/application-self.yml b/server/visits/dmvisit_service/src/main/resources/application-self.yml
new file mode 100644
index 0000000..1e9601d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/resources/application-self.yml
@@ -0,0 +1,54 @@
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Titi@168.com
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+
+debug_model: true
+
+########################鍚屾鏁版嵁妯″紡 ########################
+data-sync:
+ org-user-data-origin: 0 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ visitor-data-origin: 0 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
+ need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
+
+
+# Swagger閰嶇疆
+swagger:
+ host: 127.0.0.1
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ context-path:
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+ pay:
+ appId: wxfab6da18632e28de
+ appSecret: 4ee3b22afa90287834319fc3c1635271
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
+ keyPath: /usr/local/apiclient_cert.p12
+
+tencent:
+ map:
+ remoteHost: https://apis.map.qq.com
+ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+des_pwd: 123456SDFKDJF
--
Gitblit v1.9.3