Merge branch 'staging' into 'master'

Staging

See merge request !161

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -466,7 +466,7 @@ public class AccountServiceImpl implements AccountService {
         com.edgec.browserbackend.common.commons.utils.SmsUtils.sendNewAccountSms("15919921106", com.edgec.browserbackend.common.commons.utils.SmsUtils.SmsTemplateCode.NEWACCOUNT, param);
         com.edgec.browserbackend.common.commons.utils.SmsUtils.sendNewAccountSms("13570690305", com.edgec.browserbackend.common.commons.utils.SmsUtils.SmsTemplateCode.NEWACCOUNT, param);
 
-        // 6. 使用手机注册就送 12 元体验金
+        // 6. 使用手机注册就送 16 元体验金
         List<String> list = new ArrayList<>();
         list.add("167");
         list.add("171");

src/main/java/com/edgec/browserbackend/auth/config/OAuth2AuthorizationConfig.java

@@ -14,8 +14,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.A
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
-import org.springframework.security.oauth2.provider.token.TokenStore;
-import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore;
 
 /**
  * @author cdov
@@ -49,16 +47,16 @@ public class OAuth2AuthorizationConfig extends AuthorizationServerConfigurerAdap
 
         // @formatter:off
         clients.inMemory()
-                .withClient("browser")
-                .authorizedGrantTypes("refresh_token", "password")
-                .scopes("browser")
-                .accessTokenValiditySeconds(43200)
-                .refreshTokenValiditySeconds(43200)
-                .and()
-                .withClient("cloudam-browser")
-                .secret(env.getProperty("ACCOUNT_SERVICE_PASSWORD"))
-                .authorizedGrantTypes("client_credentials", "refresh_token")
-                .scopes("server");
+               .withClient("browser")
+               .authorizedGrantTypes("refresh_token", "password")
+               .scopes("browser")
+               .accessTokenValiditySeconds(7 * 24 * 60 * 60)
+               .refreshTokenValiditySeconds(30 * 24 * 60 * 60)
+               .and()
+               .withClient("cloudam-browser")
+               .secret(env.getProperty("ACCOUNT_SERVICE_PASSWORD"))
+               .authorizedGrantTypes("client_credentials", "refresh_token")
+               .scopes("server");
         // @formatter:on
     }
 

src/main/java/com/edgec/browserbackend/browser/domain/UserCode.java

@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
  */
 @Data
 @AllArgsConstructor
-@Document(collection = "UserCode")
+@Document(collection = "usercode")
 public class UserCode {
     @Id
     private String username;