Merge remote-tracking branch 'origin/btv2' into btv2

2021-08-27 11:54:27 +08:00 · 2021-08-27 11:54:27 +08:00 · a4e47d5bbb
commit a4e47d5bbb
parent 93892c3157 23f51c406d
4 changed files with 166 additions and 15 deletions
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+FROM openjdk:8u292-jre-buster
+ARG JAR_FILE=/target/*.jar
+COPY ${JAR_FILE} system-inspection.jar
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=jnhb","/system-inspection.jar"]
+
+# 时区问题
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
--- a/pom.xml
+++ b/pom.xml
@ -145,11 +145,11 @@
        </dependency>
        <!-- xml graphics end -->

-        <dependency>
-            <groupId>com.cm</groupId>
-            <artifactId>cloud-central-control-client</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.cm</groupId>-->
+<!--            <artifactId>cloud-central-control-client</artifactId>-->
+<!--            <version>1.0.2-SNAPSHOT</version>-->
+<!--        </dependency>-->

        <dependency>
            <groupId>org.projectlombok</groupId>
--- a/src/main/resources/application-jnhb.yml
+++ b/src/main/resources/application-jnhb.yml
@ -0,0 +1,146 @@
+server:
+  port: 7003
+  url: http://106.12.218.237:8001/inspection
+  title: 隐患上报系统
+  servlet:
+    context-path: /inspection
+
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://localhost:8668/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      db-type: mysql
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: TSkj@0471.123
+      initial-size: 2
+      min-idle: 2
+      max-active: 5
+      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
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+  activiti:
+    database-schema-update: true
+    db-history-used: true
+    history-level: full
+    check-process-definitions: false
+    rest-api-enabled: true
+    rest-api-servlet-name: activiti-swagger-document
+    SpringProcessEngineConfiguration:
+      activityFontName: 宋体
+      labelFontName: 宋体
+      dataSource: datasource
+
+# 数据库
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+  title: 接口文档
+  description: 隐患排查系统接口文档
+  service-url: http://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
+
+# 安全
+security:
+  oauth2:
+    oauth-server: http://106.12.218.237:8001/usercenter
+    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+    client:
+      client-id: 44a8dc867f7f4465b7ba6065d87e30d7
+      client-secret: bTRCTEw1TEZkL284bVhLOXJ2NDYrSUlGdU1DSlNGaGdLTWhEb1l1VHZHMG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
+      access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
+      grant-type: authorization_code
+    resource:
+      jwt:
+        key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key
+      token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token
+      user-info-uri: ${security.oauth2.oauth-server}/user
+    authorization:
+      check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
+
+api-path:
+  user-center: http://localhost:7001/usercenter
+  notice-url: http://localhost:7001/usercenter
+version: 2
+report-form:
+  check-detail: false
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /route/file/downloadfile/**
+    - /api/file/uploadfile
+    - /api/file/uploadimage
+    - /api/file/uploadvideo
+    - /api/file/uploadaudio
+  save-paths:
+    - /**/save*/**
+    - /**/add*/**
+  delete-paths:
+    - /**/delete*/**
+    - /**/remove*/**
+  update-paths:
+    - /**/update*/**
+    - /**/edit*/**
+  query-paths:
+    - /**/get*/**
+    - /**/query*/**
+    - /**/find*/**
+    - /**/list*/**
+    - /**/count*/**
+
+# 日志
+logging:
+  file: /projects/logs/inspection/logs.log
+  level:
+    root: error
+    com.cm: debug
+
+#大数据统计参数
+count-big-data:
+  jiniqu-dept-id: 0
+  shengtaiwei-dept-id: 0
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@ -21,13 +21,11 @@ spring:
  datasource:
    druid:
 #      url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
-      url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://106.12.218.237:8668/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
      db-type: mysql
      driver-class-name: com.mysql.jdbc.Driver
-#      username: wanggeng
-      username: root
-#      password: WenG>2132997
-      password: root
+      username: wanggeng
+      password: TSkj@0471.123
      initial-size: 2
      min-idle: 2
      max-active: 5
@ -85,11 +83,11 @@ file:
 # 安全
 security:
  oauth2:
-    oauth-server: http://192.168.0.103:7001/usercenter
+    oauth-server: http://106.12.218.237:8001/usercenter
    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
    client:
-      client-id: 44a8dc867f7f4465b7ba6065d87e30d7
-      client-secret: bTRCTEw1TEZkL284bVhLOXJ2NDYrSUlGdU1DSlNGaGdLTWhEb1l1VHZHMG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      client-id: 8d1a7e1da9884fbbaa6aadc285f79113
+      client-secret: dHVuaTEvbzY1S3hHbzAzMFRhcTNkK1FsZDFUYVU0MjdzdUg1ZW9JT1NNd21ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
      user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
      access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
      grant-type: authorization_code
@ -102,8 +100,8 @@ security:
      check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key

 api-path:
-  user-center: http://127.0.0.1:7001/usercenter
-  notice-url: http://127.0.0.1:7001/usercenter
+  user-center: http://106.12.218.237:8001/usercenter
+  notice-url: http://106.12.218.237:8001/usercenter
 version: 2
 report-form:
  check-detail: false