Merge branch 'master' into 20200305

@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.common.data.yunteng.utils.Demo;
 import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
@@ -65,6 +66,7 @@ public class YtUserController extends BaseController {
   private final UserService tbUserService;
   private final ApplicationEventPublisher eventPublisher;
   private final SystemSecurityService systemSecurityService;
+  private final AccountProperties accountProperties;
 
   @GetMapping("{userId}")
   public ResponseEntity<UserDTO> getUser(@PathVariable("userId") String userId)
@@ -187,7 +189,7 @@ public class YtUserController extends BaseController {
       if (null == userDTO.getId()) {
         tbUser = createTBUser(tbUser, userDTO, tenantId, customerId, Authority.TENANT_ADMIN);
         // 激活租户管理员
-        activeTBUser(tbUser.getId(),FastIotConstants.DEFAULT_PWD);
+        activeTBUser(tbUser.getId(),accountProperties.getDefaultPassword());
       }
     } catch (Exception e) {
       throw handleException(e);
@@ -362,7 +364,7 @@ public class YtUserController extends BaseController {
       tbUser.setAuthority(authority);
       tbUser.setTenantId(tenantId);
       tbUser.setCustomerId(customerId);
-      tbUser.setEmail(userDTO.getUsername() + FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB);
+      tbUser.setEmail(userDTO.getUsername() +"@"+ accountProperties.getEmailSuffix());
       tbUser = tbUserService.saveUser(tbUser);
       userDTO.setTbUser(tbUser.getId().getId().toString());
       logEntityAction(

@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
@@ -59,6 +60,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
     private final CustomerService customerService;
     private final TokenOutdatingService tokenOutdatingService;
     private final YtUserService ytUserService;
+    private final AccountProperties accountProperties;
 
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
@@ -116,7 +118,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
     private SecurityUser authenticateByPlatFormUserId(UserId userId){
         UserDTO userDTO =ytUserService.findUserInfoById(userId.getId().toString());
         if(null != userDTO){
-            String email = userDTO.getUsername() + FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
+            String email = userDTO.getUsername() + "@" +accountProperties.getEmailSuffix();
             UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, email);
             User user = new User();
             user.setAuthority(Authority.PLATFORM_USER);

@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
+import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailRoleDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
@@ -63,17 +64,20 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
   private final UserService userService;
   private final CustomerService customerService;
   private final AuditLogService auditLogService;
+  private final AccountProperties accountProperties;
 
   @Autowired
   public RestAuthenticationProvider(
       final UserService userService,
       final CustomerService customerService,
       final SystemSecurityService systemSecurityService,
-      final AuditLogService auditLogService) {
+      final AuditLogService auditLogService,
+      final AccountProperties accountProperties) {
     this.userService = userService;
     this.customerService = customerService;
     this.systemSecurityService = systemSecurityService;
     this.auditLogService = auditLogService;
+    this.accountProperties = accountProperties;
   }
 
   @Override
@@ -92,7 +96,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
       String ytUserName = username;
       UserDetailsDTO ytDetailDTO = new UserDetailsDTO();
       if (!FastIotConstants.EMAIL_PATTERN.matcher(username).matches()) {
-        username += FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
+        username += "@"+accountProperties.getEmailSuffix();
         ytDetailDTO = ytUserDetailsByUserName(ytUserName, password).get();
         // 如果是平台用户单独处理
         if (isPlatFormUser(ytDetailDTO)) {
@@ -125,7 +129,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     user.setTenantId(new TenantId(EntityId.NULL_UUID));
     user.setId(new UserId(UUID.fromString(ytDetailDTO.getId())));
     String email = ytDetailDTO.getUsername();
-    email += FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
+    email += "@"+accountProperties.getEmailSuffix();
     user.setEmail(email);
     UserCredentials userCredentials = new UserCredentials();
     SecurityUser securityUser = new SecurityUser(user, userCredentials.isEnabled(), userPrincipal);
@@ -333,7 +337,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
       throw new BadCredentialsException("验证码不正确");
     }
     User user = new User();
-    String tbEmail = optionalUser.get().getUsername() + FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
+    String tbEmail = optionalUser.get().getUsername() + "@" + accountProperties.getEmailSuffix();
     UserDetailsDTO ytDetailDTO = optionalUser.get();
     //如果是平台管理员
     if(isPlatFormUser(ytDetailDTO)){

@@ -18,7 +18,7 @@ server:
   # Server bind address
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
   # Server bind port
-  port: "${HTTP_BIND_PORT:8080}"
+  port: "${HTTP_BIND_PORT:36852}"
   # Server SSL configuration
   ssl:
     # Enable/disable SSL support
@@ -529,9 +529,12 @@ spring:
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:5432/thingsboard-3.3.2}"
+    #url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://47.99.141.212:20638/thingsboard-3.3.2}"
+    #username: "${SPRING_DATASOURCE_USERNAME:postgres}"
+    #password: "${SPRING_DATASOURCE_PASSWORD:Vrr861!@waja}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:28776/thingsboard-3.3.2}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    password: "${SPRING_DATASOURCE_PASSWORD:Pgsql@yunteng}"
+    password: "${SPRING_DATASOURCE_PASSWORD:Bua312!!iwcw}"
     hikari:
       maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:16}"
 
@@ -1114,11 +1117,15 @@ file:
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       randomFileName: ${file.storage.randomFileName}
     minio:
-      minioUrl: http://101.133.234.90:9000  #minio储存地址
+      minioUrl: http://47.99.141.212:9000  #minio储存地址
       minioName: YunTeng                    #minio账户
       minioPass: YunTeng123456              #minio访问密码
       bucketName: yunteng                   #minio储存桶名称
       randomFileName: ${file.storage.randomFileName}
+account:
+  info:
+    emailSuffix: thingskit.com
+    defaultPassword: 123456
 logging:
   level:
     org.thingsboard.server.dao.yunteng.mapper: error

@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.model.JwtToken;
+import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.config.JwtSettings;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.user.UserService;
@@ -62,9 +63,15 @@ public class TokenOutdatingTest {
     private JwtTokenFactory tokenFactory;
     private JwtSettings jwtSettings;
     private YtUserService ytUserService;
+    private AccountProperties accountProperties;
 
     private UserId userId;
 
+    public TokenOutdatingTest(YtUserService ytUserService, AccountProperties accountProperties) {
+        this.ytUserService = ytUserService;
+        this.accountProperties = accountProperties;
+    }
+
     @BeforeEach
     public void setUp() {
         jwtSettings = new JwtSettings();
@@ -94,7 +101,7 @@ public class TokenOutdatingTest {
 
         accessTokenAuthenticationProvider = new JwtAuthenticationProvider(tokenFactory, tokenOutdatingService);
         refreshTokenAuthenticationProvider = new RefreshTokenAuthenticationProvider(tokenFactory, userService, mock(CustomerService.class), tokenOutdatingService,
-                ytUserService);
+                ytUserService,accountProperties);
     }
 
     @Test

@@ -3,9 +3,6 @@ package org.thingsboard.server.common.data.yunteng.constant;
 import java.util.regex.Pattern;
 
 public interface FastIotConstants {
-
-  /** 默认密码 */
-  String DEFAULT_PWD = "123456";
   Integer JAVA_SCRIPT = 0;
   Integer CONVERT_DATA = 1;
   Integer SCENE_REACT = 2;
@@ -65,8 +62,6 @@ public interface FastIotConstants {
     String MOBILE_LOGIN_SMS_CODE = "mobileLoginSmsCode";
   }
 
-  String DEFAULT_EMAIL_SUFFIX_FOR_TB ="@yunteng.com";
-
   interface TBCacheConfig {
     String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
     String EXISTING_TENANT = "EXISTING_TENANT";

+package org.thingsboard.server.common.data.yunteng.core.utils;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "account.info")
+@Component
+@Data
+public class AccountProperties {
+    private String emailSuffix;
+    private String defaultPassword;
+}

@@ -31,6 +31,7 @@ import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAssetException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.request.*;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
@@ -78,6 +79,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   private final CacheUtils cacheUtils;
   private final UserService tbUserService;
   private final ApplicationEventPublisher eventPublisher;
+  private final AccountProperties accountProperties;
 
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username,String tenantId) {
@@ -104,7 +106,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
     } else {
-      user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
+      user.setPassword(passwordEncoder.encode(accountProperties.getDefaultPassword()));
     }
     userExist =
         baseMapper.selectCount(
@@ -394,7 +396,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     User user = new User();
     userDTO.copyToEntity(user, ID, PASSWORD, CREATE_TIME, UPDATE_TIME, ACTIVATE_TOKEN);
-    user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
+    user.setPassword(passwordEncoder.encode(accountProperties.getDefaultPassword()));
     user.setLevel(FastIotConstants.LevelValue.IS_TENANT_ADMIN);
     List<User> users =
         baseMapper.selectList(
@@ -510,7 +512,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       smsReqDTO.setPhoneNumbers(user.getPhoneNumber());
       smsReqDTO.setId(templateDTOList.get(0).getId());
       LinkedHashMap<String, String> params = new LinkedHashMap<>();
-      params.put("code", FastIotConstants.DEFAULT_PWD);
+      params.put("code", accountProperties.getDefaultPassword());
       smsReqDTO.setParams(params);
       ytSmsService.sendSms(smsReqDTO);
     }