Merge remote-tracking branch 'origin/dev' into dev2

build.gradle

@@ -12,9 +12,11 @@ subprojects {
   repositories {
     /*mavenLocal()*/
 
-    jcenter()
     maven { url 'http://113.105.74.141:8081/artifactory/libs-release' }
+    maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+    jcenter()
     maven { url "http://113.105.74.141:8081/artifactory/libs-snapshot" }
+
   }
 
   [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'

sso-common/src/main/java/com/uas/sso/core/Const.java

@@ -27,4 +27,44 @@ public class Const {
      * 香港手机号正则
      */
     public static final String REGEXP_MOBILE_HONGKONG = "[0-9]{8}";
+
+    /**
+     * 用户uu号正则
+     */
+    public static String REGEXP_USERUU_NUMBER = "[0-9]{5,10}";
+
+    /**
+     * 中国大陆
+     */
+    public static final String CONTINENT = "continent";
+
+    /**
+     * 香港
+     */
+    public static final String HONGKONG = "Hongkong";
+
+    /**
+     * 密码加密方式
+     */
+    public static final String ENCRY_FORMAT = "$password{$salt}";
+
+    /**
+     * 密码
+     */
+    public static final String ENCRY_PARAM_PASSWORD = "$password";
+
+    /**
+     * 盐值
+     */
+    public static final String ENCRY_PARAM_SALT = "$salt";
+
+    public static final int NO = 0;
+
+    public static final int YES = 1;
+
+    public static final String SUCCESS = "success";
+
+    public static final String ERROR = "error";
+
+    public static Long SPACEUU_PERSONAL = 1L;
 }

sso-manage-console-web/build.gradle

@@ -6,10 +6,22 @@ node {
   download = true
 }
 
-task npmRunDev(group: 'node', type: NpmTask) {
+yarn {
+  args = ['--registry', 'https://registry.npm.taobao.org']
+}
+
+task npmRunDev(group: 'npm', type: NpmTask, dependsOn: yarn) {
+  args = ["run", "dev"]
+}
+
+task npmRunBuild(group: 'npm', type: NpmTask, dependsOn: yarn) {
+  args = ["run", "build"]
+}
+
+task yarnRunDev(group: 'yarn', type: YarnTask, dependsOn: yarn) {
   args = ["run", "dev"]
 }
 
-task npmRunBuild(group: 'node', type: NpmTask) {
+task yarnRunBuild(group: 'yarn', type: YarnTask, dependsOn: yarn) {
   args = ["run", "build"]
 }

sso-manage-console/build.gradle

@@ -16,6 +16,7 @@ plugins {
 }
 
 apply plugin: 'com.uas.docker.spring.boot'
+apply from: "$projectDir/gradle/publish.gradle"
 
 dependencies {
   // Custom Libraries

sso-manage-console/gradle/publish.gradle

@@ -0,0 +1,42 @@
+ext {
+    artifactoryBaseUrl = 'http://113.105.74.141:8081/artifactory'
+    artifactorySnapshotRepoUrl = "$artifactoryBaseUrl/libs-snapshot-local"
+    artifactoryReleaseRepoUrl = "$artifactoryBaseUrl/libs-release-local"
+}
+
+apply plugin: 'maven-publish'
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+task sourcesJar(type: Jar) {
+    baseName "${project.name}"
+    classifier 'sources'
+    from sourceSets.main.allSource
+}
+
+publishing {
+    publications {
+        manage(MavenPublication) {
+            groupId "${project.group}"
+            artifactId "${project.name}"
+            version "${project.version}"
+
+            artifact jar
+            artifact sourcesJar
+        }
+    }
+
+    repositories {
+        maven {
+            name 'remoteArtifactory'
+            url project.version.endsWith('-SNAPSHOT') ? artifactorySnapshotRepoUrl : artifactoryReleaseRepoUrl
+
+            credentials {
+                username = 'yingp'
+                password = '111111'
+            }
+        }
+    }
+}

sso-manage-console/src/main/resources/config/application-prod.properties

@@ -0,0 +1,25 @@
+app.datasource.url=jdbc:mysql://192.168.253.6:3306/sso?characterEncoding=utf-8&useSSL=false
+app.datasource.username=root
+app.datasource.password=select111***
+app.datasource.driverClassName=com.mysql.jdbc.Driver
+app.datasource.initialSize=1
+app.datasource.minIdle=1
+app.datasource.maxActive=20
+app.datasource.maxWait=60000
+app.datasource.timeBetweenEvictionRunsMillis=60000
+app.datasource.minEvictableIdleTimeMillis=300000
+app.datasource.validationQuery=SELECT 1 FROM DUAL
+app.datasource.testWhileIdle=true
+app.datasource.testOnBorrow=true
+app.datasource.testOnReturn=false
+app.datasource.poolPreparedStatements=true
+app.datasource.timeBetweenLogStatsMillis=60000
+app.datasource.maxPoolPreparedStatementPerConnectionSize=20
+app.datasource.filters=stat,slf4j
+app.datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=update
+
+management.security.enabled=false
+logging.level.com.uas.sso.sso.backend=debug

sso-manage-console/src/main/resources/config/application-test.properties

@@ -0,0 +1,25 @@
+app.datasource.url=jdbc:mysql://192.168.253.6:3306/sso?characterEncoding=utf-8&useSSL=false
+app.datasource.username=root
+app.datasource.password=select111***
+app.datasource.driverClassName=com.mysql.jdbc.Driver
+app.datasource.initialSize=1
+app.datasource.minIdle=1
+app.datasource.maxActive=20
+app.datasource.maxWait=60000
+app.datasource.timeBetweenEvictionRunsMillis=60000
+app.datasource.minEvictableIdleTimeMillis=300000
+app.datasource.validationQuery=SELECT 1 FROM DUAL
+app.datasource.testWhileIdle=true
+app.datasource.testOnBorrow=true
+app.datasource.testOnReturn=false
+app.datasource.poolPreparedStatements=true
+app.datasource.timeBetweenLogStatsMillis=60000
+app.datasource.maxPoolPreparedStatementPerConnectionSize=20
+app.datasource.filters=stat,slf4j
+app.datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=update
+
+management.security.enabled=false
+logging.level.com.uas.sso.sso.backend=debug