Merge branch 'dev' into feature/v2.0

# Conflicts:
#	sso-server/src/main/resources/config/application-ptest.properties

sso-server/build.gradle

@@ -44,7 +44,6 @@ dependencies {
     compile("com.uas.message:message-mail-api:0.0.1")
     compile("com.uas.message:message-sms-api:0.0.1")
     compile("com.uas.account:sso-core:0.0.1-SNAPSHOT")
-    compile("com.uas.account:account-common:0.0.1-SNAPSHOT")
     compile("com.uas.dfs:dfs-api:0.0.2")
 
     compile("org.apache.zookeeper:zookeeper:3.4.6")

sso-server/src/main/java/com/uas/sso/SSOConfiguration.java

@@ -1,7 +1,6 @@
 package com.uas.sso;
 
 import com.uas.sso.profile.Pre;
-import com.uas.sso.profile.Ptest;
 import com.uas.sso.profile.Test;
 import com.uas.sso.web.AccountConfigurer;
 import com.uas.sso.filter.SSOInterceptor;
@@ -65,12 +64,6 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
         return accountConfigurer("prod");
     }
 
-    @Bean
-    @Ptest
-    public AccountConfigurer ptestAccountConfigurer() {
-        return accountConfigurer("ptest");
-    }
-
     /**
      * 获取当前环境下的配置
      *

sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -1,6 +1,6 @@
 package com.uas.sso.controller;
 
-import com.uas.account.exception.AccountException;
+import com.uas.sso.exception.AccountException;
 import com.uas.sso.core.Const;
 import com.uas.sso.entity.*;
 import com.uas.sso.service.ApplyUserSpaceService;

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -2,10 +2,10 @@ package com.uas.sso.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.AppCreateInfo;
 import com.uas.sso.core.Const;
 import com.uas.sso.dao.UserspaceDao;
 import com.uas.sso.entity.App;
+import com.uas.sso.entity.AppCreateInfo;
 import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.service.AppService;

sso-server/src/main/java/com/uas/sso/profile/Ptest.java

@@ -1,17 +0,0 @@
-package com.uas.sso.profile;
-
-import org.springframework.context.annotation.Profile;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * created by shicr on 2017/11/23
- **/
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Profile("ptest")
-public @interface Ptest {
-}

sso-server/src/main/resources/config/application-ptest.properties

@@ -1,44 +0,0 @@
-datasource.url=jdbc:mysql://192.168.100.3:3306/sso?characterEncoding=utf-8
-datasource.username=sa
-datasource.password=select111***
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=1
-datasource.maxActive=20
-datasource.maxWait=60000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=60000
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
-
-spring.redis.host=192.168.100.4
-spring.redis.port=6379
-
-message.url = http://message.ubtob.com/
-
-file.url = http://dfs-api.ubtob.com/
-
-zk.url=zookeeper://10.10.100.11:2181
-
-#ͬ²½api Ç©ÃûÃØÔ¿
-sync.cts.secret.key = uu7gz6baXzcVYnIdz6gQLQEZ61GQncghrdtYgiMd
-sync.stc.secret.key = J5jL6X5hdc6FpzOYhxPIzqXfFvmE6D8JWYRCBW7kjK4=
-sso.service.url = https://ssorest.uuzcc.cn
-
-#RabbitMq ÅäÖÃ
-spring.rabbitmq.virtual-host=account
-spring.rabbitmq.host=rabbitmq.uuzcc.cn
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=account_platform
-spring.rabbitmq.password=platform8888
-spring.rabbitmq.publisher-confirms=true
-spring.rabbitmq.publisher-returns=true
-spring.rabbitmq.listener.simple.acknowledge-mode=manual
-spring.rabbitmq.requested-heartbeat=30

sso-server/src/main/resources/config/application-test.properties

@@ -1,5 +1,5 @@
-datasource.url=jdbc:mysql://192.168.253.12:3306/sso?characterEncoding=utf-8
-datasource.username=root
+datasource.url=jdbc:mysql://192.168.100.3:3306/sso?characterEncoding=utf-8
+datasource.username=sa
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1
@@ -18,12 +18,12 @@ datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
 
-spring.redis.host=192.168.253.6
+spring.redis.host=192.168.100.4
 spring.redis.port=6379
 
-message.url = http://10.10.100.136:8080/
+message.url = http://message.ubtob.com/
 
-file.url = http://10.10.100.200:9999/
+file.url = http://dfs-api.ubtob.com/
 
 zk.url=zookeeper://10.10.100.11:2181
 

sso-server/src/main/resources/dev/account.properties

@@ -11,5 +11,3 @@ sso.front.url=http://192.168.253.6:32323
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==
 sso.center.private_key=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAvaDsIR+49m0QPLsjPkAvqLBsdl7BYZQFhRbEqcUDABbiVjyYxq+fkp7mYHbl4qPlu9SwHjyvyBZO8k2wpEYTDwIDAQABAj9Ts7SG6nm6TGneZLwpvitLSpSVqz2w1KWbGXG1fkDUyIJbNbyLmFTNAlfAgM4eC3EzVHVC3FrC+5sl4Fwn2PECIQDn9zz0xFmSQt8csMhu7jyh4UNDA3P11C9AkzaLykYNtwIhANFGtu9TJH2wZNfSA0qBNCgcyJJHXx59VTtih0R+6SVpAiEAmknpwoiDZ3SRQF0ZxCc0LxxNB9rZG475qwMACfUNqXsCIQCWLpAjSWA7jrWfp8fS1MvQKW/KgcuB/uGGf1uhTQ4VWQIhAJ6xJuj+eJAV2gsRDDjNSkD+Jm4qNaZ5ec/XnM7w2YcZ
-
-account.user.save.url=http://192.168.253.66:8080/api/user

sso-server/src/main/resources/pre/account.properties

@@ -5,11 +5,9 @@ sso.secretkey=0taQcW073Z7G628g5H
 #sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.front.url=http://192.168.253.3:36206
+sso.front.url=https://pre-sso.uuzcc.cn/
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==
 sso.center.private_key=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAvaDsIR+49m0QPLsjPkAvqLBsdl7BYZQFhRbEqcUDABbiVjyYxq+fkp7mYHbl4qPlu9SwHjyvyBZO8k2wpEYTDwIDAQABAj9Ts7SG6nm6TGneZLwpvitLSpSVqz2w1KWbGXG1fkDUyIJbNbyLmFTNAlfAgM4eC3EzVHVC3FrC+5sl4Fwn2PECIQDn9zz0xFmSQt8csMhu7jyh4UNDA3P11C9AkzaLykYNtwIhANFGtu9TJH2wZNfSA0qBNCgcyJJHXx59VTtih0R+6SVpAiEAmknpwoiDZ3SRQF0ZxCc0LxxNB9rZG475qwMACfUNqXsCIQCWLpAjSWA7jrWfp8fS1MvQKW/KgcuB/uGGf1uhTQ4VWQIhAJ6xJuj+eJAV2gsRDDjNSkD+Jm4qNaZ5ec/XnM7w2YcZ
-
-account.user.save.url=http://192.168.253.66:8080/api/user

sso-server/src/main/resources/prod/account.properties

@@ -11,5 +11,3 @@ sso.front.url=https://sso.ubtob.com,http://10.10.100.133:9990
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==
 sso.center.private_key=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAvaDsIR+49m0QPLsjPkAvqLBsdl7BYZQFhRbEqcUDABbiVjyYxq+fkp7mYHbl4qPlu9SwHjyvyBZO8k2wpEYTDwIDAQABAj9Ts7SG6nm6TGneZLwpvitLSpSVqz2w1KWbGXG1fkDUyIJbNbyLmFTNAlfAgM4eC3EzVHVC3FrC+5sl4Fwn2PECIQDn9zz0xFmSQt8csMhu7jyh4UNDA3P11C9AkzaLykYNtwIhANFGtu9TJH2wZNfSA0qBNCgcyJJHXx59VTtih0R+6SVpAiEAmknpwoiDZ3SRQF0ZxCc0LxxNB9rZG475qwMACfUNqXsCIQCWLpAjSWA7jrWfp8fS1MvQKW/KgcuB/uGGf1uhTQ4VWQIhAJ6xJuj+eJAV2gsRDDjNSkD+Jm4qNaZ5ec/XnM7w2YcZ
-
-account.user.save.url=http://10.1.51.50:8080/api/user

sso-server/src/main/resources/ptest/account.properties

@@ -1,13 +0,0 @@
-### sso config
-sso.app=sso
-# token secretkey
-sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.domain=uuzcc.cn
-sso.cookie.secure=false
-sso.cookie.browser=false
-sso.front.url=https://test-sso.uuzcc.cn
-
-### crossdomain verify
-sso.authcookie.secretkey=Z318866alN6gA0piuO
-sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==
-sso.center.private_key=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAvaDsIR+49m0QPLsjPkAvqLBsdl7BYZQFhRbEqcUDABbiVjyYxq+fkp7mYHbl4qPlu9SwHjyvyBZO8k2wpEYTDwIDAQABAj9Ts7SG6nm6TGneZLwpvitLSpSVqz2w1KWbGXG1fkDUyIJbNbyLmFTNAlfAgM4eC3EzVHVC3FrC+5sl4Fwn2PECIQDn9zz0xFmSQt8csMhu7jyh4UNDA3P11C9AkzaLykYNtwIhANFGtu9TJH2wZNfSA0qBNCgcyJJHXx59VTtih0R+6SVpAiEAmknpwoiDZ3SRQF0ZxCc0LxxNB9rZG475qwMACfUNqXsCIQCWLpAjSWA7jrWfp8fS1MvQKW/KgcuB/uGGf1uhTQ4VWQIhAJ6xJuj+eJAV2gsRDDjNSkD+Jm4qNaZ5ec/XnM7w2YcZ

sso-server/src/main/resources/test/account.properties

@@ -2,14 +2,12 @@
 sso.app=sso
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
-#sso.cookie.domain=ubtob.com
+sso.cookie.domain=uuzcc.cn
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.front.url=http://192.168.253.3:36206
+sso.front.url=https://test-sso.uuzcc.cn
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==
 sso.center.private_key=MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAvaDsIR+49m0QPLsjPkAvqLBsdl7BYZQFhRbEqcUDABbiVjyYxq+fkp7mYHbl4qPlu9SwHjyvyBZO8k2wpEYTDwIDAQABAj9Ts7SG6nm6TGneZLwpvitLSpSVqz2w1KWbGXG1fkDUyIJbNbyLmFTNAlfAgM4eC3EzVHVC3FrC+5sl4Fwn2PECIQDn9zz0xFmSQt8csMhu7jyh4UNDA3P11C9AkzaLykYNtwIhANFGtu9TJH2wZNfSA0qBNCgcyJJHXx59VTtih0R+6SVpAiEAmknpwoiDZ3SRQF0ZxCc0LxxNB9rZG475qwMACfUNqXsCIQCWLpAjSWA7jrWfp8fS1MvQKW/KgcuB/uGGf1uhTQ4VWQIhAJ6xJuj+eJAV2gsRDDjNSkD+Jm4qNaZ5ec/XnM7w2YcZ
-
-account.user.save.url=http://192.168.253.66:8080/api/user