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

pom.xml

@@ -57,26 +57,6 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>oss</id>
-            <name>oss</name>
-            <url>https://oss.sonatype.org/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
     <!--依赖管理，用于管理spring-cloud的依赖，其中Camden.SR3是版本号-->
     <dependencyManagement>
         <dependencies>

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/UserAddressController.java

@@ -21,8 +21,4 @@ public class UserAddressController extends BaseController<UserAddressBiz,UserAdd
 		return baseBiz.addUpdate(userAddress);
 	}
 
-	@GetMapping(value = "getUserAddress")
-	public ObjectRestResponse getUserAddress() {
-		return ObjectRestResponse.succ(baseBiz.getUserAddress());
-	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/UserInvoiceController.java

@@ -8,7 +8,7 @@ import com.upyuns.platform.rs.website.entity.UserInvoice;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/userInvoice/back")
+@RequestMapping("/userInvoice")
 public class UserInvoiceController extends BaseController<UserInvoiceBiz,UserInvoice> {
 
 	@GetMapping(value = "getList")
@@ -16,4 +16,9 @@ public class UserInvoiceController extends BaseController<UserInvoiceBiz,UserInv
 		return baseBiz.getList(userInvoiceDto);
 	}
 
+	@PostMapping(value = "addUpdate")
+	public ObjectRestResponse addUpdate(@RequestBody UserInvoice userInvoice) {
+		return baseBiz.addUpdate(userInvoice);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/UserAddressWebController.java

@@ -11,11 +11,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("userAddress/web")
 public class UserAddressWebController extends BaseController<UserAddressBiz,UserAddress>{
 
-	@GetMapping(value = "getList")
-	public ObjectRestResponse getList(UserAddressDto userAddressDto) {
-		return baseBiz.selectList(userAddressDto);
-	}
-
 	@PostMapping(value = "addUpdate")
 	public ObjectRestResponse addUpdate(@RequestBody UserAddress userAddress) {
 		return baseBiz.addUpdate(userAddress);
@@ -25,4 +20,5 @@ public class UserAddressWebController extends BaseController<UserAddressBiz,User
 	public ObjectRestResponse getUserAddress() {
 		return ObjectRestResponse.succ(baseBiz.getUserAddress());
 	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/UserInvoiceWebController.java

@@ -15,6 +15,7 @@ public class UserInvoiceWebController extends BaseController<UserInvoiceBiz,User
 	public ObjectRestResponse addUpdate(@RequestBody UserInvoice userInvoice) {
 		return baseBiz.addUpdate(userInvoice);
 	}
+
 	@GetMapping(value = "getUserList")
 	public ObjectRestResponse getUserList(UserInvoiceDto userInvoiceDto) {
 		return baseBiz.getUserInvoiceInfo(userInvoiceDto);