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

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

@@ -5,22 +5,19 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.CommonInfoBiz;
 import com.upyuns.platform.rs.website.dto.CommonInfoDto;
 import com.upyuns.platform.rs.website.entity.CommonInfo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("commonInfo")
 public class CommonInfoController extends BaseController<CommonInfoBiz,CommonInfo> {
 
-	@GetMapping(value = "getByType")
-	public ObjectRestResponse getByType(Integer type) {
-		return ObjectRestResponse.succ(baseBiz.getByType(type));
-	}
-
 	@GetMapping(value = "getAll")
 	public ObjectRestResponse getAll(CommonInfoDto commonInfoDto) {
 		return baseBiz.getAll(commonInfoDto);
 	}
 
+	@PostMapping(value = "addUpdate")
+	public ObjectRestResponse addUpdate(@RequestBody CommonInfo commonInfo) {
+		return baseBiz.addUpdate(commonInfo);
+	}
 }
\ No newline at end of file

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

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.CommonInfoBiz;
+import com.upyuns.platform.rs.website.dto.CommonInfoDto;
+import com.upyuns.platform.rs.website.entity.CommonInfo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("commonInfo/web")
+public class CommonInfoWebController extends BaseController<CommonInfoBiz,CommonInfo> {
+
+	@GetMapping(value = "/app/unauth/getByType")
+	public ObjectRestResponse getByType(Integer type) {
+		return ObjectRestResponse.succ(baseBiz.getByType(type));
+	}
+
+}
\ No newline at end of file