profile act

pom.xml

@@ -150,4 +150,21 @@
         </snapshotRepository>
     </distributionManagement>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profiles.activation>dev</profiles.activation>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.activation>prod</profiles.activation>
+            </properties>
+        </profile>
+    </profiles>
 </project>

rankin-api-web/src/main/java/cn/rankin/apiweb/ApiWebApplication.java

@@ -1,7 +1,5 @@
 package cn.rankin.apiweb;
 
-import cn.rankin.apiweb.configuration.FrontConfiguration;
-import cn.rankin.common.utils.configuration.RedisConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -9,7 +7,6 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
 
 @EnableFeignClients
 @EnableDiscoveryClient

rankin-api-web/src/main/resources/bootstrap.yml

@@ -1,5 +1,3 @@
-profile: dev
-
 spring:
   application:
     name: api-web
@@ -7,7 +5,7 @@ spring:
     config:
       uri: http://config.rankin.com:8921
       label: master
-      profile: ${profile}
+      profile: ${profiles.activation}
 
 server:
   port: 8600

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/MerchantDTO.java

@@ -34,4 +34,8 @@ public class MerchantDTO implements Serializable{
 
     @NotNull
     private BaseStatusEnum status;
+
+    private String contactName;
+
+    private String mobile;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Merchant.java

@@ -36,6 +36,13 @@ public class Merchant implements Serializable {
 
     private String name;
 
+    @Column(name = "contact_name")
+    private String contactName;
+
+    @Column(nullable = false)
+    @Pattern(regexp = "^[1][3,4,5,7,8,9][0-9]{9}$")
+    private String mobile;
+
     @Column(name = "license_id")
     private String licenseId;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/MerchantVo.java

@@ -22,6 +22,10 @@ public class MerchantVo implements Serializable {
 
     private String name;
 
+    private String contactName;
+
+    private String mobile;
+
     private String licenseId;
 
     private String taxNumber;