From 3080c82ac688bfcd2d5883bc2ae1136c1dd67fc4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 02:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/shiro/PasswordHelper.java | 8 ++++---- mallinkAdmin/src/main/resources/application-prod.yml | 8 +++++++- mallinkBApi/src/main/resources/application-prod.yml | 9 ++++++++- mallinkCApi/src/main/resources/application-prod.yml | 10 +++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- mallinkPosApi/src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- 10 files changed, 76 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index f9e7a6476..085389270 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -20,16 +20,16 @@ public class PasswordHelper { } - /* + public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("admin"); - user.setPassword("admin123"); + user.setUsername("sadmin"); + user.setPassword("fm2020admin"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); System.out.println(user); System.out.println(user.getPassword()); } - */ + } diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 2dcfc4604..69ae8b3c2 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -48,7 +48,13 @@ spring: regionId: cn-hangzhou dateFormat: yyyyMMdd endpointName: cn-hangzhou - + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 6f9e6719b..673236766 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 6af3cffff..93fe8adab 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -45,7 +45,15 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 4f93843b8..9ebbf91b7 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 715b298c4..b6787707f 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index b3708df45..6f9d27193 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -45,7 +45,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index ac6331e78..c1ab1613c 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index fa6b83bc0..ad75e947d 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 9c16e9070..0e231f47e 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com