Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.youlane.cn/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
91a433b100
21 измененных файлов: 442 добавлений и 167 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +44
    -20
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +0
    -0
      mallinkAdmin/src/main/resources/application-test.yml-bak
  4. +41
    -17
      mallinkBApi/src/main/resources/application-dev.yml
  5. +0
    -0
      mallinkBApi/src/main/resources/application-test.yml-bak
  6. +41
    -17
      mallinkCApi/src/main/resources/application-dev.yml
  7. +0
    -0
      mallinkCApi/src/main/resources/application-test.yml-bak
  8. +44
    -20
      mallinkCallback/src/main/resources/application-dev.yml
  9. +0
    -0
      mallinkCallback/src/main/resources/application-test.yml-bak
  10. +42
    -17
      mallinkMQConsumer/src/main/resources/application-dev.yml
  11. +0
    -0
      mallinkMQConsumer/src/main/resources/application-test.yml-bak
  12. +41
    -17
      mallinkPosApi/src/main/resources/application-dev.yml
  13. +0
    -0
      mallinkPosApi/src/main/resources/application-test.yml-bak
  14. +41
    -17
      mallinkSchedule/src/main/resources/application-dev.yml
  15. +0
    -0
      mallinkSchedule/src/main/resources/application-test.yml-bak
  16. +47
    -0
      mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java
  17. +17
    -6
      mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java
  18. +42
    -18
      mallinkSysAdmin/src/main/resources/application-dev.yml
  19. +0
    -0
      mallinkSysAdmin/src/main/resources/application-test.yml-bak
  20. +41
    -17
      mallinkWebSocketServer/src/main/resources/application-dev.yml
  21. +0
    -0
      mallinkWebSocketServer/src/main/resources/application-test.yml-bak

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -117,7 +117,7 @@ public class TenantInfoImpl implements TenantInfo {
}
if ("wx_c_user_basic_info".equals(tableName)) {
return true;
}
}
if ("wx_c_user_car".equals(tableName)) {
return true;
}


+ 44
- 20
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -28,9 +27,9 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss
# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -90,8 +89,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -109,20 +108,45 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# web:
# appId: "wxe31beafbfd8295ba"
# secret: "c689fabf3c4c9f5b6424ff2a36a26727"
# url: "https://mall.youlane.cn"
# open:
# componentAppId: "wx897e4673286c915d"
# componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 202.165.179.86
# port: 6379
# password: iF0rm@2l2ol9
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wxe31beafbfd8295ba"
secret: "c689fabf3c4c9f5b6424ff2a36a26727"
url: "https://mall.youlane.cn"
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wx897e4673286c915d"
componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -130,7 +154,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkAdmin/src/main/resources/application-test.yml → mallinkAdmin/src/main/resources/application-test.yml-bak Просмотреть файл


+ 41
- 17
mallinkBApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -27,9 +26,9 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss
# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -109,16 +108,41 @@ jasypt:
encryptor:
password: oRqdnDbK5pj3eMmB

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -126,7 +150,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkBApi/src/main/resources/application-test.yml → mallinkBApi/src/main/resources/application-test.yml-bak Просмотреть файл


+ 41
- 17
mallinkCApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -28,9 +27,9 @@ spring:

# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -105,16 +104,41 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -122,7 +146,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkCApi/src/main/resources/application-test.yml → mallinkCApi/src/main/resources/application-test.yml-bak Просмотреть файл


+ 44
- 20
mallinkCallback/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -28,9 +27,9 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss
# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -89,8 +88,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -107,20 +106,45 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# web:
# appId: "wxe31beafbfd8295ba"
# secret: "c689fabf3c4c9f5b6424ff2a36a26727"
# url: "https://mall.youlane.cn"
# open:
# componentAppId: "wx897e4673286c915d"
# componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wxe31beafbfd8295ba"
secret: "c689fabf3c4c9f5b6424ff2a36a26727"
url: "https://mall.youlane.cn"
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wx897e4673286c915d"
componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -128,7 +152,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkCallback/src/main/resources/application-test.yml → mallinkCallback/src/main/resources/application-test.yml-bak Просмотреть файл


+ 42
- 17
mallinkMQConsumer/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -29,9 +28,9 @@ spring:

# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -105,16 +104,41 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -122,10 +146,11 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10


jasypt:
encryptor:
password: oRqdnDbK5pj3eMmB


mallinkMQConsumer/src/main/resources/application-test.yml → mallinkMQConsumer/src/main/resources/application-test.yml-bak Просмотреть файл


+ 41
- 17
mallinkPosApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -27,9 +26,9 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss
# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -109,16 +108,41 @@ jasypt:
encryptor:
password: oRqdnDbK5pj3eMmB

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -126,7 +150,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkPosApi/src/main/resources/application-test.yml → mallinkPosApi/src/main/resources/application-test.yml-bak Просмотреть файл


+ 41
- 17
mallinkSchedule/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -29,9 +28,9 @@ spring:

# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -105,16 +104,41 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -122,7 +146,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkSchedule/src/main/resources/application-test.yml → mallinkSchedule/src/main/resources/application-test.yml-bak Просмотреть файл


+ 47
- 0
mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java Просмотреть файл

@@ -0,0 +1,47 @@
package com.iformall.common;

import org.springframework.web.context.request.RequestAttributes;

public class NonWebRequestAttributes implements RequestAttributes{

@Override
public Object getAttribute(String arg0, int arg1) {
return null;
}

@Override
public String[] getAttributeNames(int arg0) {
return null;
}

@Override
public String getSessionId() {
return null;
}

@Override
public Object getSessionMutex() {
return null;
}

@Override
public void registerDestructionCallback(String arg0, Runnable arg1, int arg2) {
}

@Override
public void removeAttribute(String arg0, int arg1) {
}

@Override
public Object resolveReference(String arg0) {
return null;
}

@Override
public void setAttribute(String arg0, Object arg1, int arg2) {
}

}

+ 17
- 6
mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java Просмотреть файл

@@ -9,27 +9,38 @@ public class TenantThreadLocal {
//private static ThreadLocal<String> parentLocal = new ThreadLocal<String>();
public static void setCurrentThreadTenant(String tenantId,String parentId) {
RequestContextHolder.currentRequestAttributes().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST);
RequestContextHolder.currentRequestAttributes().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST);
getRequestAttributesSafely().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST);
getRequestAttributesSafely().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST);
//local.set(tenantId);
//parentLocal.set(parentId);
}
public static String getTenantId() {
return (String)RequestContextHolder.currentRequestAttributes().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
return (String)getRequestAttributesSafely().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
//return local.get();
}
public static String getParentTenantId() {
return (String)RequestContextHolder.currentRequestAttributes().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
return (String)getRequestAttributesSafely().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
//return parentLocal.get();
}
public static void remove() {
RequestContextHolder.currentRequestAttributes().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
RequestContextHolder.currentRequestAttributes().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
getRequestAttributesSafely().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
getRequestAttributesSafely().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
//local.remove();
//parentLocal.remove();
}
//如果是非web的线程,则都为空
public static RequestAttributes getRequestAttributesSafely(){
RequestAttributes requestAttributes = null;
try{
requestAttributes = RequestContextHolder.currentRequestAttributes();
}catch (IllegalStateException e){
requestAttributes = new NonWebRequestAttributes();
}
return requestAttributes;
}
}

+ 42
- 18
mallinkSysAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -3,10 +3,9 @@ spring:
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -29,7 +28,7 @@ spring:
redis:
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -102,28 +101,53 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# web:
# appId: "wxe31beafbfd8295ba"
# secret: "c689fabf3c4c9f5b6424ff2a36a26727"
# url: "https://mall.youlane.cn"
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 5
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wxe31beafbfd8295ba"
secret: "c689fabf3c4c9f5b6424ff2a36a26727"
url: "https://mall.youlane.cn"
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
database: 2
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkSysAdmin/src/main/resources/application-test.yml → mallinkSysAdmin/src/main/resources/application-test.yml-bak Просмотреть файл


+ 41
- 17
mallinkWebSocketServer/src/main/resources/application-dev.yml Просмотреть файл

@@ -1,13 +1,12 @@
spring:
profiles:
include: aliyunRocketMQ
#include: rabbitMQ
#include: aliyunRocketMQ
include: rabbitMQ
# JDBC
datasource:
#url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -29,9 +28,9 @@ spring:

# REDIS
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 5
@@ -88,8 +87,8 @@ spring:
rabbitmq:
host: 202.165.179.86
port: 5672
username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==)
password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=)
username: fumao
password: f9l98&*%%u7flt33
publisher-confirms: true
publisher-returns: false
virtual-host: /
@@ -105,16 +104,41 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)

#wechat:
# open:
# componentAppId: "wxdfc8fb4e62d6b52b"
# componentSecret: "98daa62b316dd6feabaad708327ce233"
# componentToken: "formall2018"
# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
# redis:
# host: 101.201.103.81
# port: 6379
# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
# timeout: 3600
# expire: 1800 #30分钟
# database: 2
# defaultExpiration: 2592000 # 默认生命周期30天
# jedis:
# pool:
# max-active: 100
# max-idle: 500
# max-wait: -1
# min-idle: 10

wechat:
web:
appId: "wx091907dd0bfd3f6b"
secret: "2a2ca10738998b9ef92c1fe8a4d366a6"
url: "https://admintest.malls.iformall.com"
open:
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
componentAppId: wxdfc8fb4e62d6b52b
componentSecret: 98daa62b316dd6feabaad708327ce233
componentToken: formall2018
componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN
redis:
host: 101.201.103.81
host: 202.165.179.86
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
password: iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2
@@ -122,7 +146,7 @@ wechat:
jedis:
pool:
max-active: 100
max-idle: 500
max-idle: 100
max-wait: -1
min-idle: 10



mallinkWebSocketServer/src/main/resources/application-test.yml → mallinkWebSocketServer/src/main/resources/application-test.yml-bak Просмотреть файл


Загрузка…
Отмена
Сохранить