Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-06-12 a11bc1bed7953b88213330582c2085f60b5a73b1

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 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) {

 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%;
        }
      }

 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
      }
      // ä¸Šä¼ æˆåŠŸåŽå°†å›¾ç‰‡åœ°å€èµ‹å€¼ç»™è£å‰ªæ¡†æ˜¾ç¤ºå›¾ç‰‡

 server/meeting/meeting_admin/src/main/resources/application.yml

@@ -8,8 +8,6 @@
spring:
  application:
    name: meetingAdmin
  profiles:
    active: dev
  # JSON返回配置
  jackson:
    # é»˜è®¤æ—¶åŒº

 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
      # å®‰å…¨é…ç½®

 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
      # å®‰å…¨é…ç½®

 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
      # å®‰å…¨é…ç½®

 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:
    # éªŒç­¾å…¬é’¥åœ°å€

 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:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘现模式的配置
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      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

 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:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘现模式的配置
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      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

 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:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘现模式的配置
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      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

 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:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘现模式的配置
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      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://

 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

 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

 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

 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

 server/visits/admin_timer/src/main/resources/application.yml

@@ -7,11 +7,6 @@


spring:
  #  application:
  #    name: doumeevisit
  profiles:
    active: dev

  # JSON返回配置
  jackson:
    # é»˜è®¤æ—¶åŒº

 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

 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

 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

 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://

 server/visits/dmvisit_admin/src/main/resources/application.yml

@@ -9,8 +9,6 @@
spring:
  application:
    name: visitsAdmin
  profiles:
    active: dev

  # JSON返回配置
  jackson:

 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

 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

 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

 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
        token-uri: https://

 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(), "电话号码格式有误");

 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}")

 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) {

 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
des_pwd: 123456SDFKDJF

 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  å…¶ä»–地方就不要使用ABC了
  timeout: 10
  keepalive: 20
  topic1: A/pick/warn/#  #符号是代表整个warn下面的全部子主题 æ²¡æœ‰ç†è§£çš„话 å¯ä»¥ç™¾åº¦ä»”细理解一下
  topic2: A/cmd/resp
  topic3: ABCF
  topic4: ABCH