Merge remote-tracking branch 'origin/master'

proudkids-auth-dev.yml

@@ -26,5 +26,4 @@ urls:
     - /admin/user/editInfo
 
 logging:
-  config: classpath:logback.xml
-
+  config: classpath:logback.xml
\ No newline at end of file

proudkids-auth-prd.yml

@@ -22,7 +22,8 @@ urls:
     - /signup
     - /mobile/token
     - /ruser/mobile/token
-
+    - /admin/user/upload
+    - /admin/user/editInfo
+    
 logging:
-  config: classpath:logback.xml
-
+  config: classpath:logback.xml
\ No newline at end of file

proudkids-pay-prd.yml

+server:
+  port: 8713
+redis:
+  cache:
+    expiration: 3600
+
+spring:
+  rabbitmq:
+    host: 172.17.229.78
+    port: 5672
+    username: zzq223
+    password: 222222
+  zipkin:
+    rabbitmq:
+      queue: zipkin
+  sleuth:
+    sampler:
+      percentage: 1.0
+
+sharding:
+  jdbc:
+    defaultDataSourceName:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.jdbc.Driver
+      username: proudkids
+      password: pds123!@#
+      jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    datasource:
+      names: ds
+      ds:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.jdbc.Driver
+        username: proudkids
+        password: pds123!@#
+        jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    config:
+      sharding:
+        tables:
+          sys_log:
+            actual-data-nodes: ds.sys_log_${0..1}
+            table-strategy:
+              inline:
+                sharding-column: id
+                algorithm-expression: sys_log_${id % 2}
+            key-generator-column-name: id
+            
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*Mapper.xml
+  typeAliasesPackage: com.proudkids.pay.model.entity
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 0
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 1
+    #驼峰下划线转换
+    db-column-underline: true
+    #刷新mapper 调试神器
+    refresh-mapper: true
+    #数据库大写下划线转换
+    #capital-mode: true
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true
+    
+logging:
+  config: classpath:logback.xml
\ No newline at end of file