新增配置文件，

2021-10-16 00:11:22 +08:00 · 2021-10-16 00:11:22 +08:00 · d114893254
commit d114893254
parent 915ab078c0
3 changed files with 155 additions and 24 deletions
--- a/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java
+++ b/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java
@ -1,7 +1,11 @@
 package com.cm.inspection.listener.process;

 import com.cm.inspection.service.process.IProcessService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;

 /**
 * When you feel like quitting. Think about why you started
@ -13,32 +17,32 @@ import org.springframework.beans.factory.annotation.Autowired;
 * @Date: 2020/3/30 14:11
 * @Version: 1.0
 **/
-//@Service("selfCheckReportCompleteListener")
-public class SelfCheckReportCompleteListener /* implements TaskListener */ {
+@Service("selfCheckReportCompleteListener")
+public class SelfCheckReportCompleteListener implements TaskListener {

    @Autowired
    private IProcessService processService;

-//    @Override
-//    public void notify(DelegateTask delegateTask) {
-//        Object isReport = processService.getTaskVariableByTaskId(delegateTask.getId(), "isReport");
-//        Object isLeader = processService.getTaskVariableByTaskId(delegateTask.getId(), "isLeader");
-//        if (isReport != null && Integer.parseInt(isReport.toString()) == 1) {
-//            String reReportor = delegateTask.getVariable("reReporter").toString();
-//            if (StringUtils.isBlank(reReportor)) {
-//                return;
-//            }
-//            delegateTask.setAssignee(reReportor);
-//            return;
-//        }
-//        if (isLeader != null && Integer.parseInt(isLeader.toString()) == 1) {
-//            String leader = delegateTask.getVariable("leader").toString();
-//            if (StringUtils.isBlank(leader)) {
-//                return;
-//            }
-//            delegateTask.setAssignee(leader);\
-//            return;
-//        }
-//    }
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        Object isReport = processService.getTaskVariableByTaskId(delegateTask.getId(), "isReport");
+        Object isLeader = processService.getTaskVariableByTaskId(delegateTask.getId(), "isLeader");
+        if (isReport != null && Integer.parseInt(isReport.toString()) == 1) {
+            String reReportor = delegateTask.getVariable("reReporter").toString();
+            if (StringUtils.isBlank(reReportor)) {
+                return;
+            }
+            delegateTask.setAssignee(reReportor);
+            return;
+        }
+        if (isLeader != null && Integer.parseInt(isLeader.toString()) == 1) {
+            String leader = delegateTask.getVariable("leader").toString();
+            if (StringUtils.isBlank(leader)) {
+                return;
+            }
+            delegateTask.setAssignee(leader);
+            return;
+        }
+    }

 }
--- a/src/main/resources/application-btyj.yml
+++ b/src/main/resources/application-btyj.yml
@ -0,0 +1,127 @@
+server:
+  port: 7012
+  url: http://1.180.60.42:8084/inspection
+  title: inspection
+  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://127.0.0.1:3306/db_cloud_inspection_test?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
+
+# 数据库
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+  title: 接口文档
+  description: 隐患排查系统接口文档
+  service-url: http://1.180.60.42:8084/inspection
+  version: 1.0
+  swagger-base-package: com.cm
+
+# 文件
+file:
+  uploadPath: /root/develop/projects_test/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://1.180.60.42:8084/usercenter
+    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+    client:
+      client-id: 32ec344a5fd04fd9911586df5d1dc36b
+      client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      user-authorization-uri: ${security.oauth2.oauth-server}/oauth/authorize
+      access-token-uri: ${security.oauth2.oauth-server}/oauth/token
+      grant-type: authorization_code
+    resource:
+      jwt:
+        key-uri: ${security.oauth2.oauth-server}/oauth/token_key
+      token-info-uri: ${security.oauth2.oauth-server}/oauth/check_token
+      user-info-uri: ${security.oauth2.oauth-server}/user
+    authorization:
+      check-token-access: ${security.oauth2.oauth-server}/oauth/token_key
+
+api-path:
+  user-center: ${security.oauth2.oauth-server}
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /route/file/downloadfile/**
+  save-paths:
+    - /**/save*/**
+    - /**/add*/**
+  delete-paths:
+    - /**/delete*/**
+    - /**/remove*/**
+  update-paths:
+    - /**/update*/**
+    - /**/edit*/**
+  query-paths:
+    - /**/get*/**
+    - /**/query*/**
+    - /**/find*/**
+    - /**/list*/**
+    - /**/count*/**
+
+# 日志
+logging:
+  file: /root/develop/projects_test/logs/system-inspection/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-prod.yml
+++ b/src/main/resources/application-prod.yml
@ -1,6 +1,6 @@
 server:
  port: 8082
-  url: http://58.18.22.25:8082/inspection
+  url: http://58.18.22.25:8082/inspection/test
  title: inspection
  servlet:
    context-path: /inspection