添加docker文件和集宁环保项目配置文件

Dockerfile-jnhb

@@ -0,0 +1,4 @@
+FROM openjdk:8u292-jre-buster
+ARG JAR_FILE=/target/*.jar
+COPY ${JAR_FILE} service-user-center.jar
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=jnhb","/service-user-center.jar"]

pom.xml

@@ -136,11 +136,11 @@
 <!--        </dependency>-->
 
         <!-- 作为服务端使用 -->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.cm</groupId>
+<!--            <groupId>com.cm</groupId>-->
-            <artifactId>cloud-central-control</artifactId>
+<!--            <artifactId>cloud-central-control</artifactId>-->
-            <version>1.0.1-SNAPSHOT</version>
+<!--            <version>1.0.1-SNAPSHOT</version>-->
-        </dependency>
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>

src/main/java/com/cm/serviceusercenter/controller/dingding/apis/user/DingDingUserController.java

@@ -1,6 +1,8 @@
 package com.cm.serviceusercenter.controller.dingding.apis.user;
 
 import com.cm.common.constants.ISystemConstant;
+import com.cm.common.dingding.config.properties.DingDingAppProperties;
+import com.cm.common.exception.base.SystemException;
 import com.cm.common.result.ErrorResult;
 import com.cm.common.result.SuccessResult;
 import com.cm.serviceusercenter.service.system.user.IDingDingUserService;
@@ -27,11 +29,16 @@ public class DingDingUserController {
 
     @Autowired
     private IDingDingUserService dingDingUserService;
+    @Autowired
+    private DingDingAppProperties dingDingAppProperties;
 
     @ApiOperation(value = "同步钉钉通讯录", notes = "同步钉钉通讯录接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @PutMapping("update-sync-dingding")
     public SuccessResult updateSyncDingDing() throws Exception {
+        if (dingDingAppProperties == null || !dingDingAppProperties.getActive()) {
+            throw new SystemException("钉钉未激活");
+        }
         dingDingUserService.updateSyncDingDing();
         return new SuccessResult();
     }

src/main/resources/application-jnhb.yml

@@ -0,0 +1,240 @@
+server:
+  port: 7001
+  url: http://106.12.218.237:8001/usercenter
+  ws: ws://106.12.218.237:8001/usercenter/ws
+  title: 统一用户管理平台
+  login-page-name: 统一用户管理平台
+  servlet:
+    context-path: /usercenter
+
+spring:
+  login-url: /oauth/login
+  login-failure: /oauth/login?error
+  login-process: /userlogin
+  assets-matchers: /assets/**
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: sso-server
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://localhost:8668/db_cloud_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
+      db-type: mysql
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: TSkj@0471.123
+      initial-size: 2
+      min-idle: 2
+      max-active: 10
+      # 配置获取连接等待超时的时间
+      max-wait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      time-between-eviction-runs-millis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      # 打开PSCache，并且指定每个连接上PSCache的大小
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      # 合并多个DruidDataSource的监控数据
+      use-global-data-source-stat: true
+
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+management:
+  endpoints:
+    web:
+      enabled: true
+      exposure:
+        include: '*'
+      base-path: /manage
+    enabled-by-default: true
+  endpoint:
+    env:
+      enabled: true
+    health:
+      show-details: always
+
+# 用户，非必填
+user:
+  # 默认密码
+  default-password: 88888888
+
+oauthClient:
+  clientId: 4995b2989c274e76917a8c6144d4ab3b
+  clientSecret: ektSeDMwekFDZzl0WnpFQ0ZKZGo1T3NHZkpwODNsdHpmbGU0KzVheHVTQW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+
+swagger:
+  title: 接口文档
+  description: 用户相关接口文档
+  service-url: https://106.12.218.237:8001/
+  version: 1.0
+  swagger-base-package: com.cm
+
+file:
+  uploadPath: /projects/uploadFiles/
+  imageTypes: png,jpg,jpeg,gif,blob
+  videoTypes: mp4,rmvb
+  audioTypes: mp3,wmv
+  fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  maxFileCount: 6
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /web/**
+    - /api/oauthclient/listoauthclient
+    - /api/oauthclient/countoauthclient
+    - /api/user/countuser
+    - /api/file/uploadfile
+  save-paths:
+    - /save*/**
+    - /add*/**
+  delete-paths:
+    - /delete*/**
+    - /remove*/**
+  update-paths:
+    - /update*/**
+    - /edit*/**
+  query-paths:
+    - /get*/**
+    - /query*/**
+    - /find*/**
+    - /list*/**
+    - /count*/**
+
+logging:
+  file: /projects/logs/usercenter/logs.log
+  level:
+    root: error
+    com.cm: debug
+
+# 短信服务
+sms:
+  active: false
+  type: default
+  default-sms:
+    account: xd001382
+    password: xd001382136
+    sign: 【日喀则文化馆】
+    template:
+      verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。'
+
+open-platform:
+  # 钉钉
+  dingding:
+    # 扫码登陆，通过扫码拿到用户unionid，通过access_token获取个人信息，需要设置钉钉通讯录权限，设置访问白名单
+    scan-code-login:
+      app-id: dingoaorwac5cel8rt57rz
+      app-secret: j5n_xRR5eiWGWdNSr3z1UNtGnSRxb1sLp2aKHofwiUuxT8cnJRc46bXTCDBe2t_x
+      userinfo-url: https://oapi.dingtalk.com/sns/getuserinfo_bycode
+    # 必须有一个APP来辅助钉钉扫码登陆
+    app:
+      active: false
+      agent-id: 295981340
+      app-key: dingxz2jzohb7dft9iw7
+      app-secret: MWjSN1PUML-tCjgiSCOUR62Fs_-bdJSaHcorWhLZsd6pKTw6YL-USdsW87QWLxd6
+      token-url: https://oapi.dingtalk.com/gettoken
+      userid-by-unionid-url: https://oapi.dingtalk.com/user/getUseridByUnionid
+      userinfo-by-id-url: https://oapi.dingtalk.com/user/get
+  # 微信
+  wechat:
+    mini-app:
+      # 激活状态
+      active: false
+      authorizeUrl: https://api.weixin.qq.com/sns/jscode2session
+      # 绑定用户连接，指向统一用户，可以内网
+      bindUserUrl: http://127.0.0.1:7001/usercenter/wxminiapp/sign/logincheckusername
+      grantType: authorization_code
+      #      appKey: wxe17874894f7ff27b
+      #      appSecret: 9ab6a87ccedf6555809f1a42e3820f12
+      #      appKey: wx953da91650b16128
+      #      appSecret: 69ba0f0223da28e1472a9fe33b4c34d7
+      appKey: wxc529578602bca580
+      appSecret: fb752f8eed90ed449e7194c82756bb7f
+    # 公众号
+    official-account:
+      # 开启跨域
+      apiCrossOrigin: false
+      activate: false
+      authorize:
+        authorize-url: https://open.weixin.qq.com/connect/oauth2/authorize
+        access-token-url: https://api.weixin.qq.com/sns/oauth2/access_token
+        access-token-refresh-url: https://api.weixin.qq.com/sns/oauth2/refresh_token
+        userinfo-url: https://api.weixin.qq.com/sns/userinfo
+        response-type: code
+        scope: snsapi_userinfo
+        state: wechatRedirectUrl
+        grant-type: authorization_code
+      access-token-url: https://api.weixin.qq.com/cgi-bin/token
+      bind-user-url: http://192.168.0.113:7001/usercenter/wechat/sign/login
+      app-id: wx583634d14c596fd7
+      app-secret: 1158dcddd267c6f42b99bda62f842893
+      grant-type: client_credential
+      config-token: WenG
+
+# 邮件服务
+email:
+  active: false
+  smtp: smtp.163.com
+  port: 25
+  sender-email: dpdbd001@163.com
+  sender-password: WAASUQNNVITVXDJS
+  cc-persons:
+    - 450292408@qq.com
+    - 76158045@qq.com
+
+socket:
+  central-control:
+    active: false
+    server:
+      port: 7888
+      # 最大连接数
+      so-backlog: 1024
+      # 服务端超时断连（秒）
+      read-idle-time-second: 10
+      # 离线通知时间（分钟），默认10分钟
+      offline-notice-minute: 1
+      # 离线通知次数
+      offline-notice-count: 3
+      # 异常通知最大值
+      exception-notice-count: 10
+    client:
+      client-id: 317dce24-79cb-41c4-9d59-8b7eaa146eb1
+      client-secret: DpLh+yC8k6JwVEqsf+DCelvvIKlYd6HO60EH8hUdiWuANOlRunYMCMoUsGr0Gqh3
+      host: 49.233.36.36
+      port: 8888
+      max-reconnect-count: 20
+      reconnect-time-step: 1
+      delay-ping-seconds: 3
+      send-client-info-active: false
+      # 上报服务器数据时间
+      send-client-info-second: 30

src/main/resources/application-test.yml

@@ -29,7 +29,7 @@ spring:
   datasource:
     druid:
 #      url: jdbc:mysql://49.233.36.36:6688/db_cloud?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
-      url: jdbc:mysql://192.168.0.151:3306/db_cloud_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
+      url: jdbc:mysql://192.168.0.151:3306/db_cloud_v2_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
       db-type: mysql
       driver-class-name: com.mysql.cj.jdbc.Driver
 #      username: wanggeng