初始化代码

f847b830 · 高宇 · f847b830 · f847b830 · f847b830 · f847b830
Commit f847b830 authored Mar 22, 2024 by 高宇
10 changed files
--- a/.gitignore
+++ b/.gitignore
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
--- a/pom.xml
+++ b/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.rcisoft</groupId>
+    <artifactId>template</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <name>tea_resource_api</name>
+    <description>tea_resource_api</description>
+
+    <properties>
+        <java.version>17</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring-boot.version>2.5.5</spring-boot.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <!-- 也有人说这个 provided 可能有问题，具体可以自行测试-->
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.91isoft</groupId>
+            <artifactId>91isoft_spbt</artifactId>
+            <version>3.2.0_WF_A_beta9</version>
+            <!--            <version>3.0.0_nlt.25</version>-->
+            <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>tea_resource_api</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!--maven install deploy 需要开启以下配置-->
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <release>17</release>
+                    <source>17</source>
+                    <target>17</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <configuration>
+                    <mainClass>org.rcisoft.TeaResourceApplication</mainClass>
+                    <fork>true</fork>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>nexus-91isoft-release</id>
+            <name>local release nexus</name>
+            <url>http://nexus.91isoft.com:8081/nexus/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
+        <repository>
+            <id>nexus-91isoft-public</id>
+            <name>local private nexus</name>
+            <url>http://nexus.91isoft.com:8081/nexus/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>nexus-91isoft-third</id>
+            <name>third</name>
+            <url>http://nexus.91isoft.com:8081/nexus/repository/third/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <!--aliyun-->
+        <repository>
+            <id>aliyun-repos</id>
+            <url>https://maven.aliyun.com/repository/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+
+        <pluginRepository>
+            <id>nexus-91isoft</id>
+            <url>http://nexus.91isoft.com:8081/nexus/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+
+        <pluginRepository>
+            <id>nexus-91isoft-public</id>
+            <url>http://nexus.91isoft.com:8081/nexus/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+
+        <pluginRepository>
+            <id>nexus-releases</id>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+
+        <pluginRepository>
+            <id>aliyun-plugin</id>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+
+    </pluginRepositories>
+</project>
--- a/src/main/java/org/rcisoft/TeaResourceApplication.java
+++ b/src/main/java/org/rcisoft/TeaResourceApplication.java
+package org.rcisoft;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+
+@SpringBootApplication
+@EnableTransactionManagement
+@EnableAspectJAutoProxy
+@EnableScheduling
+@EnableGlobalMethodSecurity(prePostEnabled=true)
+@MapperScan(basePackages = {"org.rcisoft.**.dao","org.activiti.dao"})//扫描dao 不需要@repository
+public class TeaResourceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TeaResourceApplication.class, args);
+    }
+
+}
--- a/src/main/resources/application-common.yml
+++ b/src/main/resources/application-common.yml
+server:
+  port: 8090
+  tomcat:
+    max-threads: 300
+  servlet:
+    context-path: /
+    session:
+      timeout: PT480M
+  #ssl:
+  #  key-store: classpath:fy.pfx
+  #  key-store-password: cy123456
+  #  key-store-type: PKCS12
+
+mybatis-plus:
+  mapper-locations: "classpath*:mapper/**/**/*.xml"
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    type-enums-package: com.adc.*.*.enums
+    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
+
+# ------------spring component------------------
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  multipart:
+    max-file-size: 100Mb
+    max-request-size: 1000Mb
+  mvc:
+    throw-exception-if-no-handler-found: true
+    pathmatch:
+      matching-strategy: ant-path-matcher
+  freemarker:
+    charset: UTF-8
+    suffix: .ftl
+    template-loader-path: classpath:/templates/
+  # 1. rabbitmq ------
+  rabbitmq:
+    addresses: ${cy_mq.ip}:${cy_mq.port}
+    username: ${cy_mq.username}
+    password: ${cy_mq.password}
+    virtual-host: /
+    publisher-confirm-type: correlated
+    publisher-returns: true
+    template:
+      mandatory: true
+    listener:
+      simple:
+        acknowledge-mode: manual
+        retry:
+          enabled: true #是否开启重试
+          initial-interval: 3000ms #重试时间间隔
+          max-attempts: 3 #重试次数
+          max-interval: 15000ms #重试最大时间间隔
+          multiplier: 2 #倍数
+  # 2. redis ------
+  redis:
+    host: ${cy_redis.ip}
+    port: ${cy_redis.port}
+    database: ${cy_redis.database:10}
+    password: ${cy_redis.password}
+    timeout: 3000
+    jedis:
+      pool:
+        max-active:  32
+        max-idle: 16
+        max-wait: 300ms
+        min-idle: 8
+
+  # 3. redis-cluster ------
+  #  redis:
+  #    database: 0
+  #    timeout: PT2M
+  #    lettuce:
+  #      cache:
+  #        database: 0
+  #        timeout: 2000 #客户端超时时间单位是毫秒 默认是2000
+  #        maxIdle: 10 #最大空闲数
+  #        minIdle: 10 #最xiao空闲数
+  #        maxTotal: 40 #控制一个pool可分配多少个jedis实例,用来替换上面的redis.maxActive,如果是jedis 2.4以后用该属性
+  #        maxWaitMillis: 4000 #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+  #        minEvictableIdleTimeMillis: 300000 #连接的最小空闲时间 默认1800000毫秒(30分钟)
+  #        numTestsPerEvictionRun: 1024 #每次释放连接的最大数目,默认3
+  #        timeBetweenEvictionRunsMillis: 30000 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
+  #        testOnBorrow: true #是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个
+  #        testWhileIdle: true #在空闲时检查有效性, 默认false
+  #        commandTimeout: 2000
+  #        maxRedirects: 6
+  #        clusterNodes: ${redisIp}:6391,${redisIp}:6393,${redisIp}:6396,${redisIp}:6394,${redisIp}:6392,${redisIp}:6395
+  #        password: '098765'
+  #      pool:
+  #        max-active: 20
+  #        max-idle: 10
+  #        min-idle: 10
+  #        max-wait: -1s
+
+  # 4. mongodb
+  data:
+    mongodb:
+      uri: mongodb://${cy_mongodb.username}:${cy_mongodb.password}@${cy_mongodb.ip}:${cy_mongodb.port}/${cy_mongodb.db}?authSource=${cy_mongodb.authDb}
+      transactionEnabled: true
+
+  # 5. rdbms
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      minimum-idle: 50
+      maximum-pool-size: 200
+      idle-timeout: 20000
+      pool-name: DatebookHikariCP
+      max-lifetime: 180000
+      connection-timeout: 3000
+      # mysql
+      connection-test-query: select 1 from dual
+
+    #---------5.1 MYSQL-------------
+    # mysql5.0
+#    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: ${cy_db.username}
+    password: ${cy_db.password}
+
+    #---------5.2 ORACLE-------------
+#    driver-class-name: oracle.jdbc.OracleDriver
+#    url: jdbc:oracle:thin:@${cy_db.ip}:${cy_db.port}/${cy_db.db}
+#    username: ${cy_db.username}
+#    password: ${cy_db.password}
+
+knife4j:
+  markdowns: classpath:markdown/*
+  basic:
+    enable: false
+    username: zhangsan
+    password: 123456
+
+
+springfox:
+  documentation:
+    swagger:
+      v2:
+        path: /api-docs
+
+# 滑块验证码
+aj:
+  captcha:
+    # 滑块底图路径
+    #jigsaw: classpath:images/jigsaw
+    # 点选底图路径
+    #pic-click: classpath:images/pic-click
+
+    # 缓存类型 redis/local
+    cache-type: redis
+    # blockPuzzle 滑块 clickWord 文字点选  default默认两者都实例化
+    type: blockPuzzle
+    # 右下角显示字
+    water-mark: 91isoft-spbt
+    # 校验滑动拼图允许误差偏移量(默认5像素)
+    slip-offset: 5
+    # aes加密坐标开启或者禁用(true|false)
+    aes-status: true
+    # 滑动干扰项(0/1/2)
+    interference-options: 2
+    #点选字体样式 默认Font.BOLD
+    aj.captcha.font-style: 1
+    #点选字体字体大小
+    aj.captcha.font-size: 25
+    #点选文字个数,存在问题，暂不支持修改
+    #aj.captcha.click-word-count=4
+    # 接口请求次数一分钟限制是否开启 true|false
+    #aj.captcha.req-frequency-limit-enable: false
+    # 验证失败5次，get接口锁定
+    #aj.captcha.req-get-lock-limit: 5
+    # 验证失败后，锁定时间间隔,s
+    #aj.captcha.req-get-lock-seconds: 360
+    # get接口一分钟内请求数限制
+    aj.captcha.req-get-minute-limit: 30
+    # check接口一分钟内请求数限制
+    aj.captcha.req-check-minute-limit: 60
+    # verify接口一分钟内请求数限制
+    aj.captcha.req-verify-minute-limit: 60
--- a/src/main/resources/application-conf-dev.yml
+++ b/src/main/resources/application-conf-dev.yml
+# redis
+cy_redis:
+  ip: 127.0.0.1
+  port: 6379
+  password:
+  database: 10
+
+# rabbitMq
+cy_mq:
+  ip: 106.2.17.236
+  port: 5677
+  username: mq
+  password: mq
+# db
+cy_db:
+  ip: 192.144.239.97
+  port: 20220
+  username: root
+  password: rootnj23nj23jk@2
+  db: tea_resource
+
+
+# mongodb
+cy_mongodb:
+  ip: 127.0.0.1
+  port: 27017
+  username: fox
+  password: fox
+  db: cy
+  authDb: cy
+
+#cy_mongodb:
+#  ip: 124.71.16.228
+#  port: 27017
+#  username: admin
+#  password: 123456
+#  db: springboot
+#  authDb: springboot
+
+cy:
+  model:
+    swagger2Config: true
+    security:
+      enable: true
+      permission: false
+      defaultFilter: true
+      gateway: false
+      acAllowOrigin: '*'
+      acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
+      acAllowHeaders: '*'
+      permit-all:
+        permitUnStatic:
+          - "/static/**"
+          - "/webjars/**"
+          - "/v2/**"
+          - "/swagger-resources/**"
+          - "/api-docs/**"
+          - "/auth/**"
+          - "/code/**/**"
+          - "/excelUtil/**"
+          #- "/cros/**"
+          - "/nlttest/add/**"
+          - "/**/**"
+        permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
+        logoutSuccessUrl: "/login"
+        loginPage: "/login"
+        loginfailureUrl: "/login-error.html"
+
+logging:
+  level:
+    root: info
+    com.alibaba.nacos: info
+#    root: debug
+#    com.alibaba.nacos: debug
--- a/src/main/resources/application-conf-prod.yml
+++ b/src/main/resources/application-conf-prod.yml
+cy_redis:
+  ip: ENC(Vi3qXxG1X/F9TLl6z+hqsBMRpHDkW1rTJceDxd8+S4BO037RYDjXNCKE2yqwzXbJ)
+  port: ENC(GcvebRBLDTjpCIafezACbpemwiWfK5ZZoBT3FTKCtJrc5tNGCqTICU8sc3d5TaLy)
+  password: ''
+
+cy_mq:
+  ip: 106.2.17.236
+  port: 5677
+  username: mq
+  password: mq
+
+cy_db:
+  ip: ENC(rvsg3jbEGLMAipCAYaj+QUW+lYrT83+maWdm2OKbYHE9UM1M7EDBxuISEzHKoR81LqeTH6JeXPNPPI4/fK3yFw==)
+  port: ENC(JKCmJpgMw5T60JaX0OSUWAF2jSvv5q7U2sdB1MoHNsbpgTyWFhXVcgBzLTiQBkSS)
+  username: ENC(uyCMpa4vqEzmJ75HKhW4E4gXFJ87ad2LnRgu1zGU8sOW2tM4xYi+OFO0iqWr72fk)
+  password: ENC(gJfpkmx+uTJDtJvrfRhhlaAUcORxN3FuKXQIs8speoHnbA8DgNdO7pilt14Rf7hA)
+  db: ENC(MphABHmRjusKLB1keD34QKu2f8TDC+QpPhsnk2UHLrYJUiUjxtYjB9YTiobdmk3r)
+
+# mongodb
+cy_mongodb:
+  ip: 127.0.0.1
+  port: 27017
+  username: fox
+  password: fox
+  db: cy
+  authDb: cy
+
+cy:
+  model:
+    swagger2Config: true
+    security:
+      enable: true
+      permission: false
+      defaultFilter: true
+      gateway: false
+      acAllowOrigin: '*'
+      acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
+      acAllowHeaders: '*'
+      permit-all:
+        permitUnStatic:
+          - "/static/**"
+          - "/webjars/**"
+          - "/v2/**"
+          - "/swagger-resources/**"
+          - "/api-docs/**"
+          - "/auth/**"
+          - "/code/**/**"
+          - "/excelUtil/**"
+          #- "/cros/**"
+        permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
+        logoutSuccessUrl: "/login"
+        loginPage: "/login"
+        loginfailureUrl: "/login-error.html"
+
+logging:
+  level:
+    root: info
+    com.alibaba.nacos: info
\ No newline at end of file
--- a/src/main/resources/application-conf-test.yml
+++ b/src/main/resources/application-conf-test.yml
+cy_redis:
+  ip: ENC(mvBtid4B0ptIelNwiUXcjo2u9Sqtk1KuZqH8VgkI6SE2AKvOUXyhAvtDzX5E1WB2)
+  port: ENC(Hb8U4+cSwCH5kGXYzDCwzp8iibRVIr+Czyvf9Amp8kSjCNnnJ7TTe4nL/ApvGlHm)
+  password: ''
+
+cy_mq:
+  ip: 106.2.17.236
+  port: 5677
+  username: mq
+  password: mq
+
+cy_db:
+  ip: ENC(1l8x/zOoveUZN7iBCbA4AbrftCAd+Ag0zwrtz9g6TRZOa1H/jcUdeaGK3ZdvHQ9i)
+  port: ENC(JKCmJpgMw5T60JaX0OSUWAF2jSvv5q7U2sdB1MoHNsbpgTyWFhXVcgBzLTiQBkSS)
+  username: ENC(uyCMpa4vqEzmJ75HKhW4E4gXFJ87ad2LnRgu1zGU8sOW2tM4xYi+OFO0iqWr72fk)
+  password: ENC(gJfpkmx+uTJDtJvrfRhhlaAUcORxN3FuKXQIs8speoHnbA8DgNdO7pilt14Rf7hA)
+  db: ENC(MphABHmRjusKLB1keD34QKu2f8TDC+QpPhsnk2UHLrYJUiUjxtYjB9YTiobdmk3r)
+
+# mongodb
+cy_mongodb:
+  ip: 127.0.0.1
+  port: 27017
+  username: fox
+  password: fox
+  db: cy
+  authDb: cy
+
+cy:
+  model:
+    swagger2Config: true
+    security:
+      enable: true
+      permission: false
+      defaultFilter: true
+      gateway: false
+      acAllowOrigin: '*'
+      acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
+      acAllowHeaders: '*'
+      permit-all:
+        permitUnStatic:
+          - "/static/**"
+          - "/webjars/**"
+          - "/v2/**"
+          - "/swagger-resources/**"
+          - "/api-docs/**"
+          - "/auth/**"
+          - "/code/**/**"
+          - "/excelUtil/**"
+          #- "/cros/**"
+        permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
+        logoutSuccessUrl: "/login"
+        loginPage: "/login"
+        loginfailureUrl: "/login-error.html"
+
+logging:
+  level:
+    root: info
+    com.alibaba.nacos: info
\ No newline at end of file
--- a/src/main/resources/application-spbt.yml
+++ b/src/main/resources/application-spbt.yml
+#---------------------自定义配置----------------------------
+wx:
+  appId: wx111xx
+  secret: 506xxx
+  timeOut: 3600
+jwt:
+  header: Authorization
+  secret: mySecret
+  expiration: 604800
+  tokenHead: "Bearer "
+  route:
+    authentication:
+      path: "/login"
+      refresh: "/refresh"
+      register: "/register"
+cy:
+  systemName: "qms"
+  init:
+    admin:
+      - "1"
+    permission:
+      - "44"
+      - "51"
+      - "52"
+      - "53"
+    password: 111111
+    post_undelete: ["8492d7e67ca64809bb6ded8823659866"]
+    user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
+  model:
+    permission: rbac
+    schema: spbt
+    debug: false
+    rabbitMq: false
+    quartz: false
+    redis: true
+    mongodb: false
+    dbChange: true
+    redisCluster: false
+    entityParam: true
+    # md5
+    decryptParam: false
+    decryptKey: cyKey
+    # sm4
+    decryptSm4Param: false
+    decryptSm4Secret: 'FFFAAA333777EEEB'
+    fileUpload: common
+    login:
+      log: true
+      # 1 "", 2 math, 3 char, 4 block,5 word
+      captcha: 1
+    webService:
+      enable: true
+    ssl:
+      enable: false
+    opeLogDb:
+      enable: true
+      ignorePackage: org.rcisoft.web.sys
+      schema: standalone
+      addressEnabled: true
+    activiti:
+      enable: false
+      schemaUpdate: true
+      databaseType: mysql
+    code:
+      enable: true
+      author: cy
+      dbType: mysql
+      database: tea_behavior
+      basePackage: org.rcisoft
+    rejectRepeatSubmit:
+      enable: false
+      token: ft
+      expired: 1800
+    xss:
+      excludes:
+        - "/static/*"
+        - "/swagger-resources/*"
+        - "/api-docs/*"
+        - "/webjars/*"
+    access-crl:
+      enable: false
+      debug: true
+      storageModel: fail
+      whiteKeyRedis: AccessCrlWhite
+      blackKeyRedis: AccessCrlBlack
+      whiteList:
+        - "192.168.2.51"
+        - "192.168.2.51"
+      blackList:
+    pay:
+      twoDiCode:
+        apiServer: http://xxx.com
+      ali:
+        enable: false
+        config: /working/resource/ali.properties
+      wx:
+        enable: false
+        config: /working/resource/wx.properties
+      acp:
+        enable: false
+        config: /working/resource/acp.properties
+    encryption:
+      algorithm: PBEWithHmacSHA512AndAES_128
+      keyObtentionIterations: 1000
+      poolSize: 1
+      providerName: SunJCE
+      saltGeneratorClassName: org.jasypt.salt.RandomSaltGenerator
+      ivGeneratorClassName: org.jasypt.iv.RandomIvGenerator
+      stringOutputType: base64
+global:
+  path:
+    base_upload_location: /working/resource/eduServer/
+    base_discovery: 'http://192.168.1.12:8888/eduServer/'
+    code_generate_location: /code
+    video_location: /video
+    temp_location: /temp
+    file_location: /file
+    images_location: /images
+  code:
+    admin: ROLE_1001
+  resetPassword: 123456
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
+spring:
+  profiles:
+    active: dev
+    group:
+      dev: conf-dev,common,spbt
+      test: conf-test,common,spbt
+      prod: conf-prod,common,spbt
\ No newline at end of file
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+
+    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+
+            <pattern>%white(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}.%M.%L) - %cyan(%msg%n)</pattern>
+
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
+        </layout>
+<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>-->
+
+    </appender>
+
+    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>
+                %date %-5level [%thread] %logger{43}\(%L\) : %msg
+            </pattern>
+        </encoder>
+        <!--滚动策略-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--路径-->
+            <fileNamePattern>/working/test/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
+    <!--https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx50601fe1a9207d84&redirect_uri=http://gwf.natapp4.cc/sell/weixin/auth&response_type=code&scope=snsapi_userinfo&state=gwf#wechat_redirect-->
+
+    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--
+            临界值过滤器，过滤掉低于指定临界值的日志。当日志级别等于或高于临界值时，过滤器返回NEUTRAL；当日志级别低于临界值时，日志会被拒绝
+        -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>
+                %date %-5level [%thread] %logger{43}\(%L\) : %msg
+            </pattern>
+        </encoder>
+        <!--滚动策略-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--路径-->
+            <fileNamePattern>/working/test/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
+    <!--logstash配置-->
+    <appender name="logStash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>101.36.228.171:4560</destination>
+        <!-- 日志输出编码 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <timestamp>
+                    <timeZone>UTC</timeZone>
+                </timestamp>
+                <pattern>
+                    <pattern>
+                        {
+                        "logLevel": "%level",
+                        "serviceName": "${springAppName:-}",
+                        "pid": "${PID:-}",
+                        "thread": "%thread",
+                        "class": "%logger{40}",
+                        "rest": "%message"
+                        }
+                    </pattern>
+                </pattern>
+            </providers>
+        </encoder>
+        <!--<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+    </appender>
+
+
+    <!--指定对应包名 -->
+    <logger name="com.minlia" level="DEBUG"/>
+    <logger name="org.springframework.data.mybatis" level="DEBUG"/>
+    <logger name="org.springframework.aop.aspectj" level="ERROR"/>
+
+    <!--mybatis log configure-->
+    <!--
+    <logger name="com.apache.ibatis" level="TRACE"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    -->
+
+    <!-- 日志输出级别 -->
+    <!--
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
+    </root>
+    -->
+
+    <springProfile name="dev">
+        <root level="info">
+            <appender-ref ref="consoleLog" />
+            <appender-ref ref="fileInfoLog" />
+            <appender-ref ref="fileErrorLog" />
+            <!--<appender-ref ref="logStash" />-->
+        </root>
+    </springProfile>
+
+    <springProfile name="prod">
+        <root level="debug">
+            <appender-ref ref="consoleLog" />
+            <appender-ref ref="fileInfoLog" />
+            <appender-ref ref="fileErrorLog" />
+            <!--<appender-ref ref="logStash" />-->
+        </root>
+    </springProfile>
+    
+
+    <springProfile name="test">
+        <root level="debug">
+            <appender-ref ref="consoleLog" />
+            <appender-ref ref="fileInfoLog" />
+            <appender-ref ref="fileErrorLog" />
+            <!--<appender-ref ref="logStash" />-->
+        </root>
+    </springProfile>
+
+</configuration>