From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 28 +
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 65 +++
server/system_timer/src/main/resources/bootstrap-pro.yml | 28 +
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml | 28 +
server/visits/admin_timer/src/main/resources/application.yml | 5
server/visits/dmvisit_service/src/main/resources/application-pro.yml | 28
server/visits/admin_timer/src/main/resources/bootstrap.yml | 31 -
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 68 ---
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 29 -
server/visits/admin_timer/src/main/resources/bootstrap-test.yml | 28 +
server/system_gateway/src/main/resources/bootstrap-dev.yml | 94 +++++
server/system_gateway/src/main/resources/bootstrap-pro.yml | 94 +++++
admin/src/components/common/ImageCropper.vue | 32 +
admin/src/api/business/approve.js | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java | 3
server/system_timer/src/main/resources/bootstrap-test.yml | 28 +
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 28 +
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml | 28 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 3
server/visits/dmvisit_admin/src/main/resources/application.yml | 2
server/visits/dmvisit_service/src/main/resources/application-test.yml | 53 --
server/system_gateway/src/main/resources/bootstrap.yml | 97 -----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 2
server/system_timer/src/main/resources/bootstrap.yml | 29 -
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml | 28 +
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 29 +
admin/src/components/common/UploadFaceImg.vue | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 29 +
server/system_gateway/src/main/resources/bootstrap-test.yml | 94 +++++
server/meeting/meeting_admin/src/main/resources/application.yml | 2
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 29 +
31 files changed, 728 insertions(+), 326 deletions(-)
diff --git a/admin/src/api/business/approve.js b/admin/src/api/business/approve.js
index 736a63f..1bf61d9 100644
--- a/admin/src/api/business/approve.js
+++ b/admin/src/api/business/approve.js
@@ -13,11 +13,7 @@
})
}
export function taskCenterHeadPC (data) {
- return request.get('/visitsAdmin/cloudService/business/staging/taskCenterHeadPC', {
- params: {
- ...data
- }
- })
+ return request.post('/visitsAdmin/cloudService/business/staging/taskCenterHeadPC', data)
}
// 浠诲姟涓績 鍒楄〃
export function taskCenterPage (data) {
diff --git a/admin/src/components/common/ImageCropper.vue b/admin/src/components/common/ImageCropper.vue
index d15179c..37517a2 100644
--- a/admin/src/components/common/ImageCropper.vue
+++ b/admin/src/components/common/ImageCropper.vue
@@ -19,7 +19,7 @@
></vue-cropper>
</div>
<div class="previews">
- <img style="width: 100px;height: 100px;border-radius: 50%;object-fit: cover" :src="cutImgSrc" alt="鍥剧墖">
+ <img style="width: 150px;height: 150px;border-radius1: 50%;object-fit: cover" :src="cutImgSrc" alt="鍥剧墖">
</div>
</div>
</div>
@@ -74,11 +74,11 @@
autoCrop: true,
canMove: false,
centerBox: true,
- height: 300,
- width: 300,
- outputSize:{width: 300, height: 300},
- autoCropWidth: 300,
- autoCropHeight: 300,
+ height: 500,
+ width: 500,
+ outputSize:{width: 500, height: 500 },
+ autoCropWidth: 500,
+ autoCropHeight: 500,
fixed: true,
fixedNumber: [1, 1]
},
@@ -171,10 +171,12 @@
.iconShot {
.icon-dialog {
.clip {
+ display: flex;
.img {
- height: 400px;
+ flex: 7.5;
+ height: 500px;
+ //float: left;
// display: inline-block;
-
.vue-cropper {
background-image: none;
}
@@ -187,13 +189,15 @@
}
.previews {
- width: 100%;
- height: 100px;
- position: relative;
+ //width: 100px;
+ flex: 2.5;
+ //float: right;
+ height: 200px;
+ //position: relative;
>img {
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
+ //position: absolute;
+ //left: 50%;
+ transform: translate(35%, 50px);
max-height: 100%;
}
}
diff --git a/admin/src/components/common/UploadFaceImg.vue b/admin/src/components/common/UploadFaceImg.vue
index 5e72d18..4bc0b0d 100644
--- a/admin/src/components/common/UploadFaceImg.vue
+++ b/admin/src/components/common/UploadFaceImg.vue
@@ -19,7 +19,7 @@
:close-on-click-modal="false"
title="涓婁紶鍥剧墖"
:visible.sync="updateImg"
- width="800px"
+ width="1000px"
class="icon-dialog-wrapper dialong-com-style">
<ImageCropper ref="iconShot" v-if="updateImg" :imgSrc="img" >
</ImageCropper>
@@ -91,13 +91,13 @@
// 涓婁紶鍥剧墖
openUpdateIcon (file, fileList) {
const isJPG = file.raw.type === 'image/jpeg' || file.raw.type === 'image/png'
- const isLt2M = file.size / 1024 / 1024 < 2
+ const isLt2M = file.size / 1024 / 1024 < 5
if (!isJPG) {
this.$message.error('涓婁紶澶村儚鍥剧墖鍙兘鏄� JPG/PNG 鏍煎紡!')
return false
}
if (!isLt2M) {
- this.$message.error('涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!')
+ this.$message.error('涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 5MB!')
return false
}
// 涓婁紶鎴愬姛鍚庡皢鍥剧墖鍦板潃璧嬪�肩粰瑁佸壀妗嗘樉绀哄浘鐗�
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index 3dc0225..518acab 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -8,8 +8,6 @@
spring:
application:
name: meetingAdmin
- profiles:
- active: dev
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..aa4dfc5
--- /dev/null
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,29 @@
+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
+ # 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
new file mode 100644
index 0000000..7013a1d
--- /dev/null
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -0,0 +1,29 @@
+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_test
+ 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
+ # 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
new file mode 100644
index 0000000..7013a1d
--- /dev/null
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
@@ -0,0 +1,29 @@
+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_test
+ 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
+ # 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index d788ad7..e322970 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,33 +1,8 @@
spring:
+ profiles:
+ active: dev
application:
name: meetingAdmin
- 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
# 瀹夊叏閰嶇疆
security:
# 楠岀鍏挜鍦板潃
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..fc35934
--- /dev/null
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,94 @@
+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: dev_renkang
+ 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-pro.yml b/server/system_gateway/src/main/resources/bootstrap-pro.yml
new file mode 100644
index 0000000..409373d
--- /dev/null
+++ b/server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -0,0 +1,94 @@
+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_test
+# namespace: dev_renkang
+ 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-test.yml b/server/system_gateway/src/main/resources/bootstrap-test.yml
new file mode 100644
index 0000000..409373d
--- /dev/null
+++ b/server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -0,0 +1,94 @@
+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_test
+# namespace: dev_renkang
+ 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 f9d30bf..8ecd0a5 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
spring:
+ profiles:
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
@@ -6,97 +8,4 @@
# 楠岀鍏挜鍦板潃
oauth2:
authorizationserver:
- token-uri: https://
- 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: dev_renkang
- 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
+ token-uri: https://
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..289c4ea
--- /dev/null
+++ b/server/system_timer/src/main/resources/bootstrap-dev.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
+ username: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
new file mode 100644
index 0000000..6a95c65
--- /dev/null
+++ b/server/system_timer/src/main/resources/bootstrap-pro.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_test
+ username: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-test.yml b/server/system_timer/src/main/resources/bootstrap-test.yml
new file mode 100644
index 0000000..6a95c65
--- /dev/null
+++ b/server/system_timer/src/main/resources/bootstrap-test.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_test
+ 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 632116c..107b53b 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
spring:
+ profiles:
+ active: dev
application:
name: systemTimer
# 瀹夊叏閰嶇疆
@@ -7,30 +9,3 @@
oauth2:
authorizationserver:
token-uri: https://
- 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
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/resources/application.yml b/server/visits/admin_timer/src/main/resources/application.yml
index 459addc..528dfe4 100644
--- a/server/visits/admin_timer/src/main/resources/application.yml
+++ b/server/visits/admin_timer/src/main/resources/application.yml
@@ -7,11 +7,6 @@
spring:
- # application:
- # name: doumeevisit
- profiles:
- active: dev
-
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..98897aa
--- /dev/null
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-dev.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
+ username: nacos
+ password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
new file mode 100644
index 0000000..f84b8c1
--- /dev/null
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.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_test
+ username: nacos
+ password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
new file mode 100644
index 0000000..f84b8c1
--- /dev/null
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-test.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_test
+ username: nacos
+ password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index 3bcb81f..efae338 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
spring:
+ profiles:
+ active: dev
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
@@ -6,31 +8,4 @@
# 楠岀鍏挜鍦板潃
oauth2:
authorizationserver:
- token-uri: https://
- 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
+ token-uri: https://
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/application.yml b/server/visits/dmvisit_admin/src/main/resources/application.yml
index f302ac3..b09d0f7 100644
--- a/server/visits/dmvisit_admin/src/main/resources/application.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/application.yml
@@ -9,8 +9,6 @@
spring:
application:
name: visitsAdmin
- profiles:
- active: dev
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..f9589bd
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,65 @@
+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
+# 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
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
new file mode 100644
index 0000000..9b992cf
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.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_test
+ username: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
new file mode 100644
index 0000000..9b992cf
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.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_test
+ username: nacos
+ password: nacos
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 1a01249..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
spring:
+ profiles:
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
@@ -6,68 +8,4 @@
# 楠岀鍏挜鍦板潃
oauth2:
authorizationserver:
- token-uri: https://
- 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
-# 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
\ No newline at end of file
+ token-uri: https://
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a4a88cb..2a2dd80 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -62,6 +62,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -124,6 +125,7 @@
private SystemUserMapper systemUserMapper;
@Autowired
+ @Lazy
private SmsEmailService smsEmailService;
@Value("${debug_model}")
@@ -378,6 +380,7 @@
if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
+ member.setSex(model.getSex());//榛樿鏄師鏉ョ殑鎬у埆
if (StringUtils.isNotBlank(member.getPhone()) ){
if ( !PhoneUtil.isPhone(member.getPhone())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐢佃瘽鍙风爜鏍煎紡鏈夎");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index c8798f8..fcc1578 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -22,6 +22,7 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -41,6 +42,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ @Lazy
private EmayService emayService;
@Value("${debug_model}")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
index 6df84ec..d223a2b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -27,8 +28,10 @@
this.client = client;
}
@Autowired
+ @Lazy
private InterfaceLogService interfaceLogService ;
@Autowired
+ @Lazy
private SystemDictDataBiz systemDictDataBiz;
private void saveInterfaceLog(String path,String name,String req ,String res) {
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 820aa2f..2371a18 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-pro.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-pro.yml
@@ -1,38 +1,40 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: doumee
password: rtjgfEr@&0c0m
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 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-#knife4j:
-# enable: true
-# basic:
-# enable: true
-# username: admin
-# password: doumee@168.com
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
debug_model: true
-captcha_check: false
+########################鍚屾鏁版嵁妯″紡 ########################
+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:
+ host: 127.0.0.1
title: ${project.name}鎺ュ彛鏂囨。
description: ${project.name}鎺ュ彛鏂囨。
enabled: true
+ context-path:
# 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
redirect-uri: /
-
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
@@ -49,6 +51,4 @@
remoteHost: https://apis.map.qq.com
appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
-
-des_pwd: 123456SDFKDJF
\ No newline at end of file
+des_pwd: 123456SDFKDJF
diff --git a/server/visits/dmvisit_service/src/main/resources/application-test.yml b/server/visits/dmvisit_service/src/main/resources/application-test.yml
index 03700b7..2371a18 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-test.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-test.yml
@@ -1,52 +1,40 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: doumee
password: rtjgfEr@&0c0m
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
redis:
# database: 0
host: 127.0.0.1
port: 6379
password:
timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-#rocketmq:
-# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
-# groupId: GID-wakatest
-# topic: waka-test
-# username: 4derRb4Sw5EkqUMI
-# password: v50N97wf4av8Q8I4
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
-#knife4j:
-# enable: true
-# basic:
-# enable: true
-# username: admin
-# password: 111111
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: dmtest.ahapp.net
+ host: 127.0.0.1
title: ${project.name}鎺ュ彛鏂囨。
description: ${project.name}鎺ュ彛鏂囨。
enabled: true
- context-path: /erp_api
+ context-path:
# 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
redirect-uri: /
-
-########################鍚屾鏁版嵁妯″紡 ########################
-data-sync:
- org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
@@ -63,19 +51,4 @@
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
--
Gitblit v1.9.3