Forráskód Böngészése

Merge remote-tracking branch 'origin/master'

plf 4 éve
szülő
commit
6e1cfd081a

+ 92 - 0
caimei365-cloud-tools/tools-beta.yml

@@ -0,0 +1,92 @@
+spring:
+  # # 数据源连接--start
+  # datasource:
+  #   # url: jdbc:mysql://172.31.165.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+  #   # username: developer
+  #   # password: J5p3tgOVazNl4ydf
+  #   url: jdbc:mysql://119.29.164.246:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+  #   username: developer
+  #   password: 05bZ/OxTB:X+yd%1
+  #   # Hikari will use the above plus the following to setup connection pooling
+  #   type: com.zaxxer.hikari.HikariDataSource
+  #   hikari:
+  #     minimum-idle: 5
+  #     maximum-pool-size: 15
+  #     auto-commit: true
+  #     idle-timeout: 30000
+  #     pool-name: DatebookHikariCP
+  #     max-lifetime: 1800000
+  #     connection-timeout: 30000
+  #     connection-test-query: SELECT 1
+  # # 数据源连接--end
+
+  redis:
+    host: 172.31.165.27
+    port: 6379
+    password: 6#xsI%b4o@5c3RoE
+    #Redis数据库索引(默认为0)
+    database: 0
+    #连接池最大连接数(使用负值表示没有限制)
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: 3000
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间(毫秒)
+    timeout: 5000
+
+# #整合mybatis
+# mybatis:
+#   #加载Mybatis映射文件
+#   mapper-locations:
+#     - classpath:mapper/*.xml
+
+# 指定服务注册中心的地址
+eureka:
+  instance:
+    prefer-ip-address: true       # 是否使用 ip 地址注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} # ip:port
+  client:
+    service-url:                  # 设置服务注册中心地址
+      defaultZone: http://47.119.112.46:18000/eureka/
+
+
+#日志配置
+logging:
+  file:
+    path: /mnt/newdatadrive/data/runtime/cloud-instance/server-tools/logs
+  level:
+    root: info
+
+# # 微信配置
+# wx:
+#   #pcwx信息
+#   app-id: wx22be9ab1a6aa4715
+#   app-secret: ebf8cfc4dbadae3431a8b0267c4fd09f
+#   # 微信授权回调(扫码),nginx中转
+#   redirect-uri: https://www.caimei365.com/auth/callback/beta
+#   #小程序wx信息
+#   mini-app-id: wxf3cd4ae0cdd11c36
+#   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+#   #crm公众号信息
+#   crm-app-id: wxea43a0f9ebce9e66
+#   crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+#   #呵呵商城小程序信息
+#   hehe-app-id: wx2c3b0a7f343235b1
+#   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
+
+# swagger配置
+swagger:
+  # swagger开启状态,true开启,false关闭
+  enabled: true
+  ui-config:
+    operations-sorter: method
+
+# caimei:
+#   # 小程序邀请码过期天数
+#   validTime: 7
+

+ 86 - 0
caimei365-cloud-tools/tools-dev.yml

@@ -0,0 +1,86 @@
+spring:
+  # # 数据源连接--start
+  # datasource:
+  #   url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+  #   username: developer
+  #   password: 05bZ/OxTB:X+yd%1
+  #   type: com.zaxxer.hikari.HikariDataSource
+  #   hikari:
+  #     minimum-idle: 5
+  #     maximum-pool-size: 15
+  #     auto-commit: true
+  #     idle-timeout: 30000
+  #     pool-name: DatebookHikariCP
+  #     max-lifetime: 1800000
+  #     connection-timeout: 30000
+  #     connection-test-query: SELECT 1
+  # # 数据源连接--end
+  
+  redis:
+    host: 119.29.0.46
+    port: 6380
+    password: 6#xsI%b4o@5c3RoE
+    #Redis数据库索引(默认为0)
+    database: 0
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: -1
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间(毫秒)
+    timeout: 5000
+
+# #整合mybatis
+# mybatis:
+#   #加载Mybatis映射文件
+#   mapper-locations:
+#     - classpath:mapper/*.xml
+
+# 指定服务注册中心的地址
+eureka:
+  instance:
+    prefer-ip-address: true       # 是否使用 ip 地址注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} # ip:port
+  client:
+    service-url:                  # 设置服务注册中心地址
+      defaultZone: http://localhost:18000/eureka/
+
+
+# 日志配置
+logging:
+  level:
+    root: info
+    com.caimei365.user.mapper: debug
+
+
+# # 微信配置
+# wx:
+#   #pcwx信息
+#   app-id: wx22be9ab1a6aa4715
+#   app-secret: ebf8cfc4dbadae3431a8b0267c4fd09f
+#   # 微信授权回调(扫码),nginx中转
+#   redirect-uri: https://www.caimei365.com/auth/callback/beta
+#   #小程序wx信息
+#   mini-app-id: wxf3cd4ae0cdd11c36
+#   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+#   #crm公众号信息
+#   crm-app-id: wxea43a0f9ebce9e66
+#   crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+#   #呵呵商城小程序信息
+#   hehe-app-id: wx2c3b0a7f343235b1
+#   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
+
+# swagger配置
+swagger:
+  # swagger开启状态,true开启,false关闭
+  enabled: true
+  ui-config:
+    operations-sorter: method
+
+# caimei:
+#   # 小程序邀请码过期天数
+#   validTime: 7

+ 90 - 0
caimei365-cloud-tools/tools-prod.yml

@@ -0,0 +1,90 @@
+spring:
+  # # 数据源连接--start
+  # datasource:
+  #   url: jdbc:mysql://rm-wz928s8btl7kxil44.mysql.rds.aliyuncs.com:3306/caimei?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+  #   username: coder
+  #   password: diKtPYZ%wToI&9#L
+  #   # Hikari will use the above plus the following to setup connection pooling
+  #   type: com.zaxxer.hikari.HikariDataSource
+  #   hikari:
+  #     minimum-idle: 5
+  #     maximum-pool-size: 15
+  #     auto-commit: true
+  #     idle-timeout: 30000
+  #     pool-name: DatebookHikariCP
+  #     max-lifetime: 1800000
+  #     connection-timeout: 30000
+  #     connection-test-query: SELECT 1
+  # # 数据源连接--end
+
+  redis:
+    host: 172.31.165.23
+    port: 6379
+    #password: 6#xsI%b4o@5c3RoE
+    #Redis数据库索引(默认为0)
+    database: 0
+    #连接池最大连接数(使用负值表示没有限制)
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: 3000
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间(毫秒)
+    timeout: 5000
+
+# #整合mybatis
+# mybatis:
+#   #加载Mybatis映射文件
+#   mapper-locations:
+#     - classpath:mapper/*.xml
+
+# 指定服务注册中心的地址
+eureka:
+  instance:
+    prefer-ip-address: true       # 是否使用 ip 地址注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} # ip:port
+  client:
+    service-url:                  # 设置服务注册中心地址
+      defaultZone: http://120.79.162.1:18000/eureka/
+
+
+#日志配置
+logging:
+  file:
+    path: /mnt/newdatadrive/data/runtime/cloud-instance/server-tools/logs
+  level:
+    root: info
+
+# # 微信配置
+# wx:
+#   #pcwx信息
+#   app-id: wx22be9ab1a6aa4715
+#   app-secret: ebf8cfc4dbadae3431a8b0267c4fd09f
+#   # 微信授权回调(扫码),nginx中转
+#   redirect-uri: https://www.caimei365.com/auth/callback
+#   #小程序wx信息
+#   mini-app-id: wxf3cd4ae0cdd11c36
+#   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
+#   #crm公众号信息
+#   crm-app-id: wxea43a0f9ebce9e66
+#   crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+#   #呵呵商城小程序信息
+#   hehe-app-id: wx2c3b0a7f343235b1
+#   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
+
+# swagger配置
+swagger:
+  # swagger开启状态,true开启,false关闭
+  enabled: false
+  ui-config:
+    operations-sorter: method
+
+# caimei:
+#   # 小程序邀请码过期天数
+#   validTime: 7
+
+