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

.gitignore

@@ -58,3 +58,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 # /src/test/
+/src/test/java/com/uas/platform/b2c/RegistForMall.java
+/src/test/java/com/uas/platform/b2c/testForRestTemplate.java
+/.gitignore
+/src/test/java/com/uas/platform/b2c/testAaa.java

pom.xml

@@ -46,8 +46,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<artifactId>servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -158,7 +158,7 @@ public class StoreIn implements Serializable {
 	 * 资质证明信息集合
 	 */
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, targetEntity = Qualification.class)
-	@JoinColumn(name = "qu_store_uuid", referencedColumnName = "st_uuid")
+	@JoinColumn(name = "qu_store_id")
 	private Set<Qualification> qualifications = new HashSet<>();
 
 	/**

src/main/resources/prod/sys.properties

@@ -32,7 +32,7 @@ storecmsMicroServiceIp=10.10.0.30
 endpointUri=10.10.100.23
 recommendPort=20100
 # upload file
-uploadFileUrl=http://10.10.0.254:20290
+uploadFileUrl=http://dfs-api.ubtob.com
 # search file
 searchUrl=http://10.10.0.76:8081
 

src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -96,7 +96,7 @@
                 <div class="rt_menu"><span>今日新店</span></div>
                 <dl>
                     <dt class="border">
-                        <img style="max-height: 100%;max-width: 100%;" src="http://dfs.ubtob.com/group1/M00/17/F7/CgpkyFjbJEKAVMbMAAAmpGFAdUM616.png"/>
+                        <img style="max-height: 100%;max-width: 100%;" ng-src="{{store.logoUrl}}"/>
                     </dt>
                     <dd>
                         <p title="{{store.storeName}}">店铺名称：{{store.storeName}} </p>