Merge remote-tracking branch 'origin/feature/v.2.0.0' into feature/v.2.0.0

# Conflicts: # air/src/main/java/com/air/land/controller/LandListedController.java # air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java # air/src/main/resources/application.yml
3 years ago · fb9507e883
2 changed files with 150 additions and 2 deletions
--- a/air/pom.xml
+++ b/air/pom.xml
@ -31,7 +31,7 @@
        <!--阿里云私服-->
        <repository>
            <id>maven-public</id>
-            <url>http://125.64.9.108:10086/repository/maven-public/</url>
+            <url>http://121.37.221.239:48081/repository/maven-public/</url>
            <!--能下载正式版本-->
            <releases>
                <enabled>true</enabled>
--- a/air/src/main/resources/application.yml
+++ b/air/src/main/resources/application.yml
@ -1 +1,149 @@
-server:
  port: 8080

spring:
  application:
    name: air
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      driver-class-name: com.mysql.cj.jdbc.Driver
      username: air
      password: air123456
      #      url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
      url: jdbc:mysql://124.71.210.242:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
#      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
      stat-view-servlet:
        enabled: true
        url-pattern: /druid/*
        login-username: admin
        login-password: 1qaz2wsx
      filter:
        stat:
          enabled: true
          log-slow-sql: true
          slow-sql-millis: 10000
          merge-sql: false
        wall:
          config:
            multi-statement-allow: true
      only-show-slow-sql: false
  redis:
    key-prefix: 'at:'
    host: 127.0.0.1
#    password: 1qaz2wsx
  servlet:
    multipart:
      max-file-size: 100MB
      max-request-size: 100MB
      location: /opt/air/tmp_files
  freemarker:
    allow-request-override: false
    allow-session-override: false
    cache: true
    charset: UTF-8
    check-template-location: true
    content-type: text/html
    enabled: true
    expose-request-attributes: false
    expose-session-attributes: false
    expose-spring-macro-helpers: true
    prefer-file-system-access: true
    suffix: .ftl
    template-loader-path: classpath:/templates/
  cache:
    redis:
      time-to-live: 24h
mybatis-plus:
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
  tenant-enable: true
  mapper-locations: classpath*:/mapper/**/*Mapper.xml
  global-config:
    banner: false
    db-config:
      id-type: auto
      insert-strategy: not_empty
      update-strategy: not_empty
      select-strategy: not_empty
  type-handlers-package:  com.cinderella.framework.common.data.handler
management:
  endpoint:
    health:
      show-details: always
## spring security 配置
security:
  oauth2:
    resource:
      token-info-uri: http://127.0.0.1:${server.port}/oauth/check_token
    client:
      client-id: cinderella
      client-secret: cinderella
      scope: server
      ignore-urls:
        - /druid/**
        - /applets/landlisted/calendar/**
        - /applets/landlisted/list/**
        - /cityArea/**
        - /planSpot/getSpotListByPlanId/**
#        - /**

# 文件系统
minio:
  url: http://127.0.0.1:9000
  down-url: https://yoursairdata.com
  access-key: air
  secret-key: 1qaz2wsx
  bucket: air

template:
  land_listed: /air/%E5%B7%B2%E6%8C%82%E7%89%8C%E5%9C%B0%E5%9D%97%E6%A8%A1%E6%9D%BF.xlsx
  land_to_listed: /air/%E6%8B%9F%E6%8C%82%E7%89%8C%E5%9C%B0%E5%9D%97%E6%A8%A1%E6%9D%BF.xlsx


# Logger Config
logging:
  level:
    com.cinderella.framework.admin.mapper: debug

#内置字典允许编辑
sys.dict.modify.enable: true
#注册接口[register/mobile]需要图片验证码
sys.register.mobileRegisterNeedGraphCode: false
#注册接口[register/mobile]不需要短信验证码
sys.register.mobileRegisterNeedSmsCode: false
#社交登录[social/register-bind]不需要短信验证码
sys.register.socialBindNeedSmsCode: false

# 租户表维护
cinderella:
  tenant:
    column: tenant_id
    tables:
      - sys_user
      - sys_dept
      - sys_log
      - sys_file

swagger:
  title: Cinderella Swagger API
  license: Powered By Cinderella
  base-package: com

ignore:
  clients:
    - app
+server:
+  port: 9002
+
+spring:
+  application:
+    name: air
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+#      username: air
+#      password: air123456
+      username: root
+      password: root
+      url: jdbc:mysql://127.0.0.1:3306/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+#      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      #      url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      username: air
+      password: air123456
+      #      url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://124.71.210.242:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+#      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        login-username: admin
+        login-password: 1qaz2wsx
+      filter:
+        stat:
+          enabled: true
+          log-slow-sql: true
+          slow-sql-millis: 10000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+      only-show-slow-sql: false
+#  redis:
+#    key-prefix: 'at:'
+#    host: 192.168.40.102
+#    password: 1qaz2wsx
+  redis:
+    key-prefix: 'at:'
+    host: 127.0.0.1
+#    password: 1qaz2wsx
+    host: 127.0.0.1
+    password:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+      location: /opt/air/tmp_files
+  freemarker:
+    allow-request-override: false
+    allow-session-override: false
+    cache: true
+    charset: UTF-8
+    check-template-location: true
+    content-type: text/html
+    enabled: true
+    expose-request-attributes: false
+    expose-session-attributes: false
+    expose-spring-macro-helpers: true
+    prefer-file-system-access: true
+    suffix: .ftl
+    template-loader-path: classpath:/templates/
+  cache:
+    redis:
+      time-to-live: 24h
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  tenant-enable: true
+  mapper-locations: classpath*:/mapper/**/*Mapper.xml
+  global-config:
+    banner: false
+    db-config:
+      id-type: auto
+      insert-strategy: not_empty
+      update-strategy: not_empty
+      select-strategy: not_empty
+  type-handlers-package:  com.cinderella.framework.common.data.handler
+management:
+  endpoint:
+    health:
+      show-details: always
+## spring security 配置
+security:
+  oauth2:
+    resource:
+      token-info-uri: http://127.0.0.1:${server.port}/oauth/check_token
+    client:
+      client-id: cinderella
+      client-secret: cinderella
+      scope: server
+      ignore-urls:
+        - /druid/**
+        - /applets/landlisted/calendar/**
+        - /applets/landlisted/list/**
+        - /cityArea/**
+        - /planSpot/getSpotListByPlanId/**
+#        - /**
+
+# 文件系统
+minio:
+  url: http://124.71.210.242:9000
+  down-url: https://yoursairdata.com
+  access-key: air
+  secret-key: 1qaz2wsx
+  bucket: air
+
+template:
+  land_listed: /air/%E5%B7%B2%E6%8C%82%E7%89%8C%E5%9C%B0%E5%9D%97%E6%A8%A1%E6%9D%BF.xlsx
+  land_to_listed: /air/%E6%8B%9F%E6%8C%82%E7%89%8C%E5%9C%B0%E5%9D%97%E6%A8%A1%E6%9D%BF.xlsx
+
+
+# Logger Config
+logging:
+  level:
+    com.cinderella.framework.admin.mapper: debug
+
+#内置字典允许编辑
+sys.dict.modify.enable: true
+#注册接口[register/mobile]需要图片验证码
+sys.register.mobileRegisterNeedGraphCode: false
+#注册接口[register/mobile]不需要短信验证码
+sys.register.mobileRegisterNeedSmsCode: false
+#社交登录[social/register-bind]不需要短信验证码
+sys.register.socialBindNeedSmsCode: false
+
+# 租户表维护
+cinderella:
+  tenant:
+    column: tenant_id
+    tables:
+      - sys_user
+      - sys_dept
+      - sys_log
+      - sys_file
+
+swagger:
+  title: Cinderella Swagger API
+  license: Powered By Cinderella
+  base-package: com
+
+ignore:
+  clients:
+    - app
+