修改pom文件和配置文件

687f0034 · 王琮 · 4713f4c4 · 687f0034 · 687f0034 · 687f0034
Commit 687f0034 authored Nov 14, 2022 by 王琮
Showing with 192 additions and 176 deletions

pom.xml pom.xml +2 -2

application-common.yml src/main/resources/application-common.yml +150 -162

application-dev-conf.yml src/main/resources/application-dev-conf.yml +40 -12

No files found.
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
        <dependency>
            <groupId>org.91isoft</groupId>
            <artifactId>91isoft_spbt</artifactId>
-            <version>3.0.0_nlt.35</version>
+            <version>3.0.1_fk_beta2</version>
            <!--            <version>3.0.0_nlt.25</version>-->
            <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
            <!--            <exclusions>
@@ -89,7 +89,7 @@
    </dependencies>

    <build>
-        <finalName>nlt_api</finalName>
+        <finalName>entrance_api</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>

--- a/src/main/resources/application-common.yml
+++ b/src/main/resources/application-common.yml
@@ -11,22 +11,20 @@ server:
  #  key-store-password: cy123456
  #  key-store-type: PKCS12

-
 mybatis-plus:
-  configuration:
-    call-setters-on-nulls: true
  mapper-locations: "classpath*:mapper/**/**/*.xml"
  global-config:
    db-config:
      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+
 spring:
  main:
    allow-bean-definition-overriding: true
  rabbitmq:
-    addresses: ${mqIp}:5677
-    username: fy
-    password: fy
+    addresses: ${cy_mq.ip}:${cy_mq.port}
+    username: ${cy_mq.username}
+    password: ${cy_mq.password}
    virtual-host: /
    publisher-confirm-type: correlated
    publisher-returns: true
@@ -41,12 +39,12 @@ spring:
          max-attempts: 3 #重试次数
          max-interval: 15000ms #重试最大时间间隔
          multiplier: 2 #倍数
-#  redis -----------单节点-----start-----
+  #  redis -----------单节点-----start-----
  redis:
-    host: ${redisIp}
-    port: ${redisPort}
+    host: ${cy_redis.ip}
+    port: ${cy_redis.port}
    database: 0
-    password: '123456'
+    password: ${cy_redis.password}
    timeout: 3000
    jedis:
      pool:
@@ -54,7 +52,35 @@ spring:
        max-idle: 16
        max-wait: 300ms
        min-idle: 8
-#  redis -----------单节点-----end-----
+  #  redis -----------单节点-----end-----
+
+  #  redis -----------cluster-----start-----
+  #  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
+  #  redis -----------cluster-----end-----
  multipart:
    max-file-size: 100Mb
    max-request-size: 1000Mb
@@ -64,6 +90,75 @@ spring:
    charset: UTF-8
    suffix: .ftl
    template-loader-path: classpath:/templates/
+
+  # 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
+
+      # rdbms
+
+      #  datasource:
+      #----------KINGBASE------------
+      #type: com.alibaba.druid.pool.DruidDataSource
+      #driverClassName: com.kingbase8.Driver
+      #druid:
+      #  url: jdbc:kingbase8://127.0.0.1:54321/FP?characterEncoding=utf8&&useSSL=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+      #  username: SYSTEM
+      #  password: root
+      #  driverClassName: com.kingbase8.Driver
+      #  initialSize: 5
+      #  minIdle: 5
+      #  maxActive: 20
+      #  maxWait: 60000
+      #  timeBetweenEvictionRunsMillis: 60000
+      #  minEvictableIdleTimeMillis: 300000
+      #  maxPoolPreparedStatementPerConnectionSize: 20
+      #  maxOpenPreparedStatements: 20
+      #  validationQuery: SELECT 'x'
+      #  testWhileIdle: true
+      #  testOnBorrow: true
+      #  testOnReturn: false
+      #  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+      #----------POSTGRES------------
+      #    url: jdbc:postgresql://10.96.131.16:15432/91isoft
+      #    username: postgres
+      #    password: postgres
+      #    driver-class-name: org.postgresql.Driver
+
+      #---------ORACLE-------------
+      #      driver-class-name: oracle.jdbc.driver.OracleDriver
+      #      type: com.zaxxer.hikari.HikariDataSource
+      #      url: jdbc:oracle:thin:@106.2.17.221:1521:fydb
+      #      username: fy_first
+      #      password: fy
+
+      #---------SQL SERVER-------------
+      #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #url: jdbc:sqlserver://111.111.111.111:11433;DatabaseName=jpp_demo
+      #username: sa
+      #password: 91isoftlll@qazwsx
+
+    #---------MYSQL-------------
+  #      #driver-class-name: com.mysql.jdbc.Driver
+
+  #      driver-class-name: com.mysql.cj.jdbc.Driver
+  #      url: jdbc:mysql://localhost:3306/rbac?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  #      username: root
+  #      password: 123456
+  #      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
+  #        connection-test-query: select 1 from dual
+
+  #        ----------------sharding-jdbc--------------------------------------
  shardingsphere:
    props:
      sql-show: true
@@ -71,24 +166,23 @@ spring:
      names: cy1,cy2
      cy1:
        driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://${nlt_db.ip}:${nlt_db.port}/${nlt_db.db}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#        jdbc-url: jdbc:mysql://${nlt_db.ip}:${nlt_db.port}/zj?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-        username: ${nlt_db.username}
-        password: ${nlt_db.password}
+        jdbc-url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: ${cy_db.username}
+        password: ${cy_db.password}
        type: com.zaxxer.hikari.HikariDataSource
        hikari:
-          minimum-idle: 100
+          minimum-idle: 50
          maximum-pool-size: 200
          idle-timeout: 20000
          pool-name: DatebookHikariCP
          max-lifetime: 180000
-          connection-timeout: 10000
+          connection-timeout: 3000
          connection-test-query: select 1 from dual
      cy2:
        driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://${nlt_db.ip}:${nlt_db.port}/information_schema?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-        username: ${nlt_db.username}
-        password: ${nlt_db.password}
+        jdbc-url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/information_schema?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: ${cy_db.username}
+        password: ${cy_db.password}
        type: com.zaxxer.hikari.HikariDataSource
        hikari:
          minimum-idle: 50
@@ -98,14 +192,13 @@ spring:
          max-lifetime: 180000
          connection-timeout: 3000
          connection-test-query: select 1 from dual
-
    # 必须配置rules, otherwise -> `No qualifying bean of type 'org.apache.shardingsphere.infra.config.mode.ModeConfiguration' available`
    rules:
      sharding:
        #1.----分片算法配置-----
        sharding-algorithms:
          # 不要用 _ 用 -
-          nlt-scan-algo:
+          month-algo:
            type: INTERVAL
            props:
              datetime-pattern: yyyy-MM-dd HH:mm:ss
@@ -115,7 +208,7 @@ spring:
              datetime-interval-amount: 1
              datetime-interval-unit: MONTHS
              allow-range-query-with-inline-sharding: true
-          nlt-scan-algo-year:
+          year-algo:
            type: INTERVAL
            props:
              datetime-pattern: yyyy-MM-dd HH:mm:ss
@@ -123,27 +216,7 @@ spring:
              datetime-upper: 2033-12-31 23:59:59
              sharding-suffix-pattern: yyyy
              datetime-interval-amount: 1
-              datetime-interval-unit: YEARS
-              allow-range-query-with-inline-sharding: true
-          sys-login-algo:
-            type: INTERVAL
-            props:
-              datetime-pattern: yyyy-MM-dd HH:mm:ss
-              datetime-lower: 2022-01-01 00:00:00
-              datetime-upper: 2033-12-31 23:59:59
-              sharding-suffix-pattern: yyyy
-              datetime-interval-amount: 1
-              datetime-interval-unit: MONTHS
-              allow-range-query-with-inline-sharding: true
-          sys-error-algo:
-            type: INTERVAL
-            props:
-              datetime-pattern: yyyy-MM-dd HH:mm:ss
-              datetime-lower: 2022-01-01 00:00:00
-              datetime-upper: 2033-12-31 23:59:59
-              sharding-suffix-pattern: yyyy
-              datetime-interval-amount: 1
-              datetime-interval-unit: MONTHS
+              datetime-interval-unit: Years
              allow-range-query-with-inline-sharding: true
        #2.----分布式序列算法配置-----
        #        key-generators:
@@ -153,62 +226,9 @@ spring:
        #3.分表策略
        tables:
          # 表名，按实际的来
-          nlt_scan:
-            # 3.1表分布规则
-            actual-data-nodes: cy1.nlt_scan_$->{['2022']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-#            actual-data-nodes: cy1.nlt_scan_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            # 3.2 主键生成  -> 2
-            #            key-generate-strategy:
-            #              column: business_id
-            #              key-generator-name: sys-course-generator
-            # 3.3 分表/分库策略 -> 1
-            table-strategy:
-              standard:
-                sharding-column: line_date
-                sharding-algorithm-name: nlt-scan-algo
-          nlt_test:
-            # 3.1表分布规则
-            actual-data-nodes: cy1.nlt_test_$->{['2022']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            #            actual-data-nodes: cy1.nlt_test_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            # 3.2 主键生成  -> 2
-            #            key-generate-strategy:
-            #              column: business_id
-            #              key-generator-name: sys-course-generator
-            # 3.3 分表/分库策略 -> 1
-            table-strategy:
-              standard:
-                sharding-column: line_date
-                sharding-algorithm-name: nlt-scan-algo
-          nlt_test_info:
-            # 3.1表分布规则
-            actual-data-nodes: cy1.nlt_test_info_$->{['2022']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            #            actual-data-nodes: cy1.nlt_test_info_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            # 3.2 主键生成  -> 2
-            #            key-generate-strategy:
-            #              column: business_id
-            #              key-generator-name: sys-course-generator
-            # 3.3 分表/分库策略 -> 1
-            table-strategy:
-              standard:
-                sharding-column: line_date
-                sharding-algorithm-name: nlt-scan-algo
-          nlt_heating_tube_info:
-            # 3.1表分布规则
-            actual-data-nodes: cy1.nlt_heating_tube_info_$->{['2022','2023','2024','2025','2026','2027','2028','2029']}
-            #            actual-data-nodes: cy1.nlt_test_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
-            # 3.2 主键生成  -> 2
-            #            key-generate-strategy:
-            #              column: business_id
-            #              key-generator-name: sys-course-generator
-            # 3.3 分表/分库策略 -> 1
-            table-strategy:
-              standard:
-                sharding-column: line_date
-                sharding-algorithm-name: nlt-scan-algo-year
-          nlt_heating_tube:
+          sys_login_info:
            # 3.1表分布规则
-            actual-data-nodes: cy1.nlt_heating_tube_$->{['2022']}
-            #            actual-data-nodes: cy1.nlt_test_info_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
+            actual-data-nodes: cy1.sys_login_info_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}
            # 3.2 主键生成  -> 2
            #            key-generate-strategy:
            #              column: business_id
@@ -216,25 +236,20 @@ spring:
            # 3.3 分表/分库策略 -> 1
            table-strategy:
              standard:
-                sharding-column: line_date
-                sharding-algorithm-name: nlt-scan-algo-year
-          sys_login_info:
-            actual-data-nodes: cy1.sys_login_info_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}
+                sharding-column: login_time
+                sharding-algorithm-name: year-algo
+          sys_oper_log:
+            actual-data-nodes: cy1.sys_oper_log_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}_$->{['01','02','03','04','05','06','07','08','09','10','11','12']}
            table-strategy:
              standard:
-                sharding-column: login_time
-                sharding-algorithm-name: sys-login-algo
+                sharding-column: oper_time
+                sharding-algorithm-name: month-algo
          sys_error_log:
            actual-data-nodes: cy1.sys_error_log_$->{['2022','2023','2024','2025','2026','2027','2028','2029','2030','2031','2032','2033']}
            table-strategy:
              standard:
                sharding-column: oper_time
-                sharding-algorithm-name: sys-error-algo
-  #            database-strategy:
-  #              standard:
-  #                sharding-column: course_sort
-  #                sharding-algorithm-name: sys-course-sort
-          # information_schema.tables
+                sharding-algorithm-name: year-algo
          tables:
            actual-data-nodes: cy2.tables
          columns:
@@ -258,15 +273,15 @@ jwt:
      register: "/register"

 cy:
-  systemName: "mess系统"
+  systemName: "91isoft"
  init:
    admin:
      - "1"
    permission:
-    - "44"
-    - "51"
-    - "52"
-    - "53"
+      - "44"
+      - "51"
+      - "52"
+      - "53"
    password: 111111
    post_undelete: ["8492d7e67ca64809bb6ded8823659866"]
    user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
@@ -277,7 +292,8 @@ cy:
    debug: false
    rabbitMq: false
    quartz: false
-    redis: true
+    redis: false
+    mongodb: false
    dbChange: true
    loginLog: true
    redisCluster: false
@@ -287,12 +303,12 @@ cy:
    decryptSm4Secret: 'FFFAAA333666DDDB'
    fileUpload: common
    webService:
-      enable: false
+      enable: true
    ssl:
      enable: false
    opeLogDb:
      enable: true
-      ignorePackage: org.rcisoft.sys
+      ignorePackage: org.rcisoft.web.sys
      schema: standalone
      addressEnabled: true
    activiti:
@@ -304,17 +320,17 @@ cy:
      author: cy
      dbType: mysql
      database: rcisoft
-      basePackage: org.rcisoft.nlt
+      basePackage: org.rcisoft.sys
    rejectRepeatSubmit:
      enable: false
      token: ft
      expired: 1800
    xss:
      excludes:
-      - "/static/*"
-      - "/swagger-resources/*"
-      - "/api-docs/*"
-      - "/webjars/*"
+        - "/static/*"
+        - "/swagger-resources/*"
+        - "/api-docs/*"
+        - "/webjars/*"
    access-crl:
      enable: false
      debug: true
@@ -322,8 +338,8 @@ cy:
      whiteKeyRedis: AccessCrlWhite
      blackKeyRedis: AccessCrlBlack
      whiteList:
-      - "192.168.2.51"
-      - "192.168.2.51"
+        - "192.168.2.51"
+        - "192.168.2.51"
      blackList:
    pay:
      twoDiCode:
@@ -338,6 +354,14 @@ cy:
        enable: false
        config: /working/resource/acp.properties
 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
  decryptKey: cyKey
@@ -354,39 +378,3 @@ wx:
  appId: wx111xx
  secret: 506xxx
  timeOut: 3600
-
-nlt:
-  night_work:
-    startTime: '00:00'
-    endTime: '06:59'
-  pad_passwordKey: "$2a$10$QgmEKyKUZquiBg/KfI9MzelX0twan/M8GlPw7XI5vxjlsMQuSddte"
-  pad_password: "admin321"
-dict:
-  contract: "dataAuthority"
-  region: "region"
-  Beijing: "NB"
-  Suzhou: "NOSZ"
-  specialRoles: "specialRoles"
-  factory: "factory"
-  year: "year"
-  month: "month"
-  day: "day"
-role:
-  common: 'roleType'
-
-
-qrCode:
-  #分隔符
-  separator: " "
-  #料号
-  materNo: "4"
-  #批次号
-  batchNo: "3"
-  #唯一码
-  niqueCode: "1"
-  #数量
-  count: "5"
-
-aop:
-  aspectLog:
-    enable: true
\ No newline at end of file
--- a/src/main/resources/application-dev-conf.yml
+++ b/src/main/resources/application-dev-conf.yml
-redisIp: 124.71.16.228
-redisPort: 6397
-
-mqIp: 0.0.0.0
+# redis
+cy_redis:
+  ip: 124.71.16.228
+  port: 6397
+  password: '123456'

-nlt_db:
+# rabbitMq
+cy_mq:
+  ip: 106.2.17.236
+  port: 5677
+  username: mq
+  password: mq
+# db
+cy_db:
  ip: 124.71.16.228
  port: 13307
  username: root
  password: root
  db: entrance

+#cy_db:
+#  ip: 127.0.0.1
+#  port: 3306
+#  username: root
+#  password: 111111
+
+# 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
@@ -20,8 +51,7 @@ cy:
      gateway: false
      acAllowOrigin: '*'
      acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
-      # chrome 52.0 * 不支持
-      acAllowHeaders: 'Authorization,*'
+      acAllowHeaders: '*'
      permit-all:
        permitUnStatic:
          - "/static/**"
@@ -34,17 +64,15 @@ cy:
          - "/excelUtil/**"
          #- "/cros/**"
          - "/nlttest/add/**"
-          - "/nlttest/queryVersion/**"
-          #- "/**/**"
+          - "/**/**"
        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