Merge remote-tracking branch 'origin/dev_jcet' into dev_temp

epmet-auth/src/main/java/com/epmet/constant/SsoConstant.java

@@ -9,7 +9,7 @@ public interface SsoConstant {
     /**
      * 酒城e通appId
      */
-    String WINE_CITY_E_OPEN_APP_ID = "hw0f263b5d3dc4f7c5";
+    String WINE_CITY_E_OPEN_APP_ID = "64929543";
 
     String USER_INFO_IS_NULL = "【jcetApiService.getUserInfoByTicket(formDTO.getTicket()】结果为空......";
 

epmet-auth/src/main/java/com/epmet/controller/SsoController.java

@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
  * @DateTime 2021/1/18 下午4:33
  */
 @RestController
-@RequestMapping("sso/resi")
+@RequestMapping("sso")
 public class SsoController {
 
     @Autowired
@@ -35,7 +35,7 @@ public class SsoController {
      * @author zxc
      * @date 2021/1/18 下午4:59
      */
-    @PostMapping("login")
+    @PostMapping("resi/login")
     public Result<SsoLoginResultDTO> ssoLogin(@RequestBody SsoLoginFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, SsoLoginFormDTO.SsoLoginForm.class);
         return new Result<SsoLoginResultDTO>().ok(ssoService.ssoLogin(formDTO));