From faee574fcc82d23f3be51894058c8f3c0346e010 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 19 Oct 2021 17:08:09 +0800 Subject: [PATCH] fix config --- .../main/resources/yml-config/gateway-dev.yml | 32 +++++++++-------- .../resources/yml-config/gateway-prod.yml | 30 ++++++++-------- .../yml-config/service-advertisement-dev.yml | 4 +-- .../yml-config/service-device-dev.yml | 4 +-- .../yml-config/service-fumao-dev.yml | 4 +-- .../yml-config/service-inventory-dev.yml | 4 +-- .../yml-config/service-member-dev.yml | 4 +-- .../resources/yml-config/service-org-dev.yml | 4 +-- .../resources/yml-config/service-ota-dev.yml | 4 +-- .../yml-config/service-payment-dev.yml | 4 +-- .../yml-config/service-payorder-dev.yml | 4 +-- .../yml-config/service-promotion-dev.yml | 4 +-- .../resources/yml-config/service-ssl-dev.yml | 4 +-- .../yml-config/service-trade-dev.yml | 36 ++++++++++--------- .../yml-config/service-trade-prod.yml | 32 +++++++++-------- .../resources/yml-config/service-user-dev.yml | 4 +-- .../yml-config/service-wxopen-dev.yml | 4 +-- .../payment/constants/FumaoPayConstants.java | 5 +-- .../repository/FumaoPayRepository.java | 18 ++++++---- .../smart/pos/user/service/UserService.java | 1 + 20 files changed, 110 insertions(+), 96 deletions(-) diff --git a/config-server/src/main/resources/yml-config/gateway-dev.yml b/config-server/src/main/resources/yml-config/gateway-dev.yml index 6662efc..d19c648 100644 --- a/config-server/src/main/resources/yml-config/gateway-dev.yml +++ b/config-server/src/main/resources/yml-config/gateway-dev.yml @@ -15,7 +15,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 @@ -227,20 +227,22 @@ smart: enabled: true oss: endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota + accessId: LTAI4G7ixY4AhvM35F8o3W3V + accessKey: VfWqGb83qIQrS9us45utskl8itd7ry + host: https://formall.oss-accelerate.aliyuncs.com + bucketName: formall url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk + host: http://fmneupostest.malls.iformall.com/ + ota: http://fmneupostest.malls.iformall.com/otadev/ + media: http://fmneupostest.malls.iformall.com/media/ + config: http://fmneupostest.malls.iformall.com/config/ + codeLib: http://fmneupostest.malls.iformall.com/codeLib/ + img: http://fmneupostest.malls.iformall.com/img/ + qrCode: http://fmneupostest.malls.iformall.com/qrCode/ + storeLogo: http://fmneupostest.malls.iformall.com/logo/ + apk: http://fmneupostest.malls.iformall.com/apk upload: path: /tmp - relativePath: /tmp \ No newline at end of file + relativePath: /tmp + fmapi: + url: https://ptest.malls.iformall.com \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/gateway-prod.yml b/config-server/src/main/resources/yml-config/gateway-prod.yml index 5fc6af4..737d89d 100644 --- a/config-server/src/main/resources/yml-config/gateway-prod.yml +++ b/config-server/src/main/resources/yml-config/gateway-prod.yml @@ -215,20 +215,22 @@ smart: enabled: true oss: endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota + accessId: LTAI4G7ixY4AhvM35F8o3W3V + accessKey: VfWqGb83qIQrS9us45utskl8itd7ry + host: https://formall.oss-accelerate.aliyuncs.com + bucketName: formall url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk + host: http://fmneupos.malls.iformall.com/ + ota: http://fmneupos.malls.iformall.com/otadev/ + media: http://fmneupos.malls.iformall.com/media/ + config: http://fmneupos.malls.iformall.com/config/ + codeLib: http://fmneupos.malls.iformall.com/codeLib/ + img: http://fmneupos.malls.iformall.com/img/ + qrCode: http://fmneupos.malls.iformall.com/qrCode/ + storeLogo: http://fmneupos.malls.iformall.com/logo/ + apk: http://fmneupos.malls.iformall.com/apk upload: path: /tmp - relativePath: /tmp \ No newline at end of file + relativePath: /tmp + fmapi: + url: https://pos.malls.iformall.com \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-advertisement-dev.yml b/config-server/src/main/resources/yml-config/service-advertisement-dev.yml index 31fae7e..5ae5ae3 100644 --- a/config-server/src/main/resources/yml-config/service-advertisement-dev.yml +++ b/config-server/src/main/resources/yml-config/service-advertisement-dev.yml @@ -21,7 +21,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -51,7 +51,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-device-dev.yml b/config-server/src/main/resources/yml-config/service-device-dev.yml index 2c3b3ee..7a0e5be 100644 --- a/config-server/src/main/resources/yml-config/service-device-dev.yml +++ b/config-server/src/main/resources/yml-config/service-device-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-fumao-dev.yml b/config-server/src/main/resources/yml-config/service-fumao-dev.yml index 2e206b2..ee63615 100644 --- a/config-server/src/main/resources/yml-config/service-fumao-dev.yml +++ b/config-server/src/main/resources/yml-config/service-fumao-dev.yml @@ -17,7 +17,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -47,7 +47,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-inventory-dev.yml b/config-server/src/main/resources/yml-config/service-inventory-dev.yml index 4ddaf47..f8d3fe8 100644 --- a/config-server/src/main/resources/yml-config/service-inventory-dev.yml +++ b/config-server/src/main/resources/yml-config/service-inventory-dev.yml @@ -25,7 +25,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -55,7 +55,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-member-dev.yml b/config-server/src/main/resources/yml-config/service-member-dev.yml index c30dfb2..ead9417 100644 --- a/config-server/src/main/resources/yml-config/service-member-dev.yml +++ b/config-server/src/main/resources/yml-config/service-member-dev.yml @@ -22,7 +22,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -52,7 +52,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-org-dev.yml b/config-server/src/main/resources/yml-config/service-org-dev.yml index b87df2c..0205a51 100644 --- a/config-server/src/main/resources/yml-config/service-org-dev.yml +++ b/config-server/src/main/resources/yml-config/service-org-dev.yml @@ -18,7 +18,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -48,7 +48,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-ota-dev.yml b/config-server/src/main/resources/yml-config/service-ota-dev.yml index b8b68d3..4782538 100644 --- a/config-server/src/main/resources/yml-config/service-ota-dev.yml +++ b/config-server/src/main/resources/yml-config/service-ota-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-payment-dev.yml b/config-server/src/main/resources/yml-config/service-payment-dev.yml index eeffdae..2093d99 100644 --- a/config-server/src/main/resources/yml-config/service-payment-dev.yml +++ b/config-server/src/main/resources/yml-config/service-payment-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-payorder-dev.yml b/config-server/src/main/resources/yml-config/service-payorder-dev.yml index 679d31a..51f546a 100644 --- a/config-server/src/main/resources/yml-config/service-payorder-dev.yml +++ b/config-server/src/main/resources/yml-config/service-payorder-dev.yml @@ -17,7 +17,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -47,7 +47,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-promotion-dev.yml b/config-server/src/main/resources/yml-config/service-promotion-dev.yml index 3aa992b..9a07a3a 100644 --- a/config-server/src/main/resources/yml-config/service-promotion-dev.yml +++ b/config-server/src/main/resources/yml-config/service-promotion-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-ssl-dev.yml b/config-server/src/main/resources/yml-config/service-ssl-dev.yml index f102653..74d3f13 100644 --- a/config-server/src/main/resources/yml-config/service-ssl-dev.yml +++ b/config-server/src/main/resources/yml-config/service-ssl-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-trade-dev.yml b/config-server/src/main/resources/yml-config/service-trade-dev.yml index 4503c8f..b5fda6b 100644 --- a/config-server/src/main/resources/yml-config/service-trade-dev.yml +++ b/config-server/src/main/resources/yml-config/service-trade-dev.yml @@ -22,7 +22,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -52,7 +52,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 @@ -92,18 +92,20 @@ smart: #微信点餐URL wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota - url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk + endpoint: oss-cn-beijing.aliyuncs.com + accessId: LTAI4G7ixY4AhvM35F8o3W3V + accessKey: VfWqGb83qIQrS9us45utskl8itd7ry + host: https://formall.oss-accelerate.aliyuncs.com + bucketName: formall + url: + host: http://fmneupostest.malls.iformall.com/ + ota: http://fmneupostest.malls.iformall.com/otadev/ + media: http://fmneupostest.malls.iformall.com/media/ + config: http://fmneupostest.malls.iformall.com/config/ + codeLib: http://fmneupostest.malls.iformall.com/codeLib/ + img: http://fmneupostest.malls.iformall.com/img/ + qrCode: http://fmneupostest.malls.iformall.com/qrCode/ + storeLogo: http://fmneupostest.malls.iformall.com/logo/ + apk: http://fmneupostest.malls.iformall.com/apk + fmapi: + url: https://ptest.malls.iformall.com diff --git a/config-server/src/main/resources/yml-config/service-trade-prod.yml b/config-server/src/main/resources/yml-config/service-trade-prod.yml index d3b9d79..443d875 100644 --- a/config-server/src/main/resources/yml-config/service-trade-prod.yml +++ b/config-server/src/main/resources/yml-config/service-trade-prod.yml @@ -88,18 +88,20 @@ smart: #微信点餐URL wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota - url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk \ No newline at end of file + endpoint: oss-cn-beijing.aliyuncs.com + accessId: LTAI4G7ixY4AhvM35F8o3W3V + accessKey: VfWqGb83qIQrS9us45utskl8itd7ry + host: https://formall.oss-accelerate.aliyuncs.com + bucketName: formall + url: + host: http://fmneupos.malls.iformall.com/ + ota: http://fmneupos.malls.iformall.com/otadev/ + media: http://fmneupos.malls.iformall.com/media/ + config: http://fmneupos.malls.iformall.com/config/ + codeLib: http://fmneupos.malls.iformall.com/codeLib/ + img: http://fmneupos.malls.iformall.com/img/ + qrCode: http://fmneupos.malls.iformall.com/qrCode/ + storeLogo: http://fmneupos.malls.iformall.com/logo/ + apk: http://fmneupos.malls.iformall.com/apk + fmapi: + url: https://pos.malls.iformall.com \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-user-dev.yml b/config-server/src/main/resources/yml-config/service-user-dev.yml index f3df69b..68b13fe 100644 --- a/config-server/src/main/resources/yml-config/service-user-dev.yml +++ b/config-server/src/main/resources/yml-config/service-user-dev.yml @@ -18,7 +18,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -48,7 +48,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/config-server/src/main/resources/yml-config/service-wxopen-dev.yml b/config-server/src/main/resources/yml-config/service-wxopen-dev.yml index 9b48bf4..fb66031 100644 --- a/config-server/src/main/resources/yml-config/service-wxopen-dev.yml +++ b/config-server/src/main/resources/yml-config/service-wxopen-dev.yml @@ -19,7 +19,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://172.17.173.169:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false username: root password: fm2020test #初始化大小,最小,最大 @@ -49,7 +49,7 @@ spring: #数据库索引 database: 0 #主机地址 - host: 172.17.173.169 + host: 101.200.130.134 #主机端口 port: 6379 #密码 diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/payment/constants/FumaoPayConstants.java b/service-trade/src/main/java/com/neusoft/smart/pos/payment/constants/FumaoPayConstants.java index 65b1098..37d3bd0 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/payment/constants/FumaoPayConstants.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/payment/constants/FumaoPayConstants.java @@ -1,12 +1,13 @@ package com.neusoft.smart.pos.payment.constants; +import org.springframework.stereotype.Component; + /** * 富茂常量 */ +@Component public class FumaoPayConstants { - public static final String DOMAIN_API = "https://pos.malls.iformall.com";//"https://pos.malls.iformall.com";//"https://ptest.malls.iformall.com";//"https://pos.youlane.cn/api"; - public static final String FIELD_SIGN = "sign"; public static final String DEV_REQ_KEY = "qVH2YDmXJ$ok4a95"; diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/FumaoPayRepository.java b/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/FumaoPayRepository.java index e3e3bbc..201dbfc 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/FumaoPayRepository.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/payment/repository/FumaoPayRepository.java @@ -36,6 +36,7 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.ArrayList; @@ -57,6 +58,9 @@ public class FumaoPayRepository implements IThirdPayRepository { @Resource FumaoUserInfoMapper fumaoUserInfoMapper; + + @Value("${smart.pos.constant.fmapi.url}") + private String fmPosApi; /** * 富茂会员查询与试算接口 @@ -68,7 +72,7 @@ public class FumaoPayRepository implements IThirdPayRepository { //1.封装请求数据数据 String RequestData = fumaoMemberRequestDataHandle(fumaoPayRequest); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.QUERY_AND_CALC_SUFFIX, RequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.QUERY_AND_CALC_SUFFIX, RequestData); //3.记录日志 LogUtils.savePaymentTradeLog("","", "",LogUtils.LOG_DESCRIPTION_CXSS,RequestData,responseData,DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); //4.封装结果并返回 @@ -158,7 +162,7 @@ public class FumaoPayRepository implements IThirdPayRepository { //1.封装请求数据数据 String RequestData = fumaoCheckUserRequestDataHandle(fumaoCheckUserRequest); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.CHECK_USER_PASSWORD, RequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.CHECK_USER_PASSWORD, RequestData); //3.记录日志 LogUtils.savePaymentTradeLog("","", "",LogUtils.LOG_DESCRIPTION_YHDL,RequestData,responseData,DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); //4.封装结果并返回 @@ -220,7 +224,7 @@ public class FumaoPayRepository implements IThirdPayRepository { //1.封装请求数据数据 String RequestData = fumaoPosOrderSyncRequestDataHandle(fumaoPosOrderSyncRequest); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.POS_ORDER_SYNC, RequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.POS_ORDER_SYNC, RequestData); logger.info("posOrderSync:responseData="+responseData); //3.记录日志 LogUtils.savePaymentTradeLog("",fumaoPosOrderSyncRequest.getOrderNumber(), DictionaryConstant.PAY_TYPE_MULTY_COMBINED.getCode(),LogUtils.LOG_DESCRIPTION_DDTB,RequestData,responseData,DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); @@ -301,7 +305,7 @@ public class FumaoPayRepository implements IThirdPayRepository { String couponRequestData = fumaoCouponOrderRequestDataHandle(payOrder); logger.info("createPayOrderToThirdPlatform::couponRequestData=" + couponRequestData); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.COUPON_VERIFY_URL_SUFFIX, couponRequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.COUPON_VERIFY_URL_SUFFIX, couponRequestData); logger.info("createPayOrderToThirdPlatform::couponResponseData=" + responseData); //3.记录日志 LogUtils.savePaymentTradeLog(payOrder.getMcode(), payOrder.getmOrderNumber(), DictionaryConstant.PAYMENT_PAY_TYPE_FM_COUPON_PAY.getCode(), LogUtils.LOG_DESCRIPTION_DDSC, couponRequestData, responseData, DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); @@ -409,7 +413,7 @@ public class FumaoPayRepository implements IThirdPayRepository { String couponRequestData = fumaoCouponOrderCancelRequestDataHandle(payOrder); logger.info("cannelPayOrderFromThirdPlatform::couponRequestData=" + couponRequestData); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); logger.info("cannelPayOrderFromThirdPlatform::couponResponseData=" + responseData); //3.记录日志 LogUtils.savePaymentTradeLog(payOrder.getMcode(), payOrder.getmOrderNumber(), DictionaryConstant.PAYMENT_PAY_TYPE_FM_COUPON_PAY.getCode(), LogUtils.LOG_DESCRIPTION_SQTK, couponRequestData, responseData, DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); @@ -441,7 +445,7 @@ public class FumaoPayRepository implements IThirdPayRepository { String couponRequestData = fumaoCouponOrderCancelRequestDataHandle(payOrder); logger.info("refundPayOrderFromThirdPlatform::couponRequestData=" + couponRequestData); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); logger.info("refundPayOrderFromThirdPlatform::couponResponseData=" + responseData); //3.记录日志 LogUtils.savePaymentTradeLog(payOrder.getMcode(), payOrder.getmOrderNumber(), DictionaryConstant.PAYMENT_PAY_TYPE_FM_COUPON_PAY.getCode(), LogUtils.LOG_DESCRIPTION_SQTK, couponRequestData, responseData, DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); @@ -456,7 +460,7 @@ public class FumaoPayRepository implements IThirdPayRepository { String couponRequestData = fumaoCouponOrderCancelRequestDataHandle(payOrder); logger.info("reversePayOrderFromThirdPlatform::couponRequestData=" + couponRequestData); //2.请求富茂会员接口 - String responseData = HttpClientUtils.postData(FumaoPayConstants.DOMAIN_API + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); + String responseData = HttpClientUtils.postData(fmPosApi + FumaoPayConstants.COUPON_VERIFY_CANCEL_URL_SUFFIX, couponRequestData); logger.info("reversePayOrderFromThirdPlatform::couponResponseData=" + responseData); //3.记录日志 LogUtils.savePaymentTradeLog(payOrder.getMcode(), payOrder.getmOrderNumber(), DictionaryConstant.PAYMENT_PAY_TYPE_FM_COUPON_PAY.getCode(), LogUtils.LOG_DESCRIPTION_SQTK, couponRequestData, responseData, DictionaryConstant.PAYMENT_REQUEST_TYPE_ZD.getCode()); diff --git a/service-user/src/main/java/com/neusoft/smart/pos/user/service/UserService.java b/service-user/src/main/java/com/neusoft/smart/pos/user/service/UserService.java index e72275b..bf96364 100644 --- a/service-user/src/main/java/com/neusoft/smart/pos/user/service/UserService.java +++ b/service-user/src/main/java/com/neusoft/smart/pos/user/service/UserService.java @@ -31,6 +31,7 @@ import io.jsonwebtoken.SignatureAlgorithm; import lombok.val; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import sun.misc.BASE64Decoder;