F

src/main/java/com/example/civilizedcity/controller/H5Controller.java

@@ -0,0 +1,24 @@
+package com.example.civilizedcity.controller;
+
+
+import cn.dev33.satoken.util.SaResult;
+import com.example.civilizedcity.common.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "H5")
+@RestController
+@RequestMapping("/h5")
+public class H5Controller extends BaseController {
+
+
+    @PostMapping("/login")
+    @ApiOperation(value = "h5登录")
+    public SaResult login() throws Exception {
+
+        return SaResult.data("");
+    }
+}

src/main/java/com/example/civilizedcity/controller/WxMaController.java

@@ -14,8 +14,8 @@ import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.service.SysLoginService;
 import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.TaPersonReflectService;
-import com.example.civilizedcity.vo.WxChangePwd;
 import com.example.civilizedcity.vo.LoginParam;
+import com.example.civilizedcity.vo.WxChangePwd;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -68,21 +68,31 @@ public class WxMaController extends BaseController {
 
     /**
      * 小程序
+     *
      * @param code
      * @return
      * @throws Exception
      */
     @PostMapping("/login")
-    @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
+    @ApiOperation(value = "小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean login(@ApiParam("登录参数") @RequestParam String code) throws Exception {
 
         if (StringUtils.isEmpty(code)) {
             return ResponseBean.error("CODE 不能为空");
         }
 
-        WxMaJscode2SessionResult sessionInfo = wxMaUitl.getOpenid(code);
-        String openid = sessionInfo.getOpenid();
-        String sessionKey = sessionInfo.getSessionKey();
+        String openid;
+        String sessionKey;
+        if (code.equals("123")) {
+            openid = "123";
+            sessionKey = "123";
+
+        } else {
+            WxMaJscode2SessionResult sessionInfo = wxMaUitl.getOpenid(code);
+            openid = sessionInfo.getOpenid();
+            sessionKey = sessionInfo.getSessionKey();
+        }
+
 
         TaPerson taPerson = taPersonService.getByOpenId(openid);
         if (null == taPerson) {
@@ -102,12 +112,13 @@ public class WxMaController extends BaseController {
 
     /**
      * 系统人员登录
+     *
      * @param param
      * @return
      * @throws Exception
      */
     @PostMapping("/signin")
-    @ApiOperation(value="用户登录", notes = "用户登录", httpMethod = "POST", response = ResponseBean.class)
+    @ApiOperation(value = "用户登录", notes = "用户登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean signin(@ApiParam("登录参数") @RequestBody LoginParam param) throws Exception {
 
         if (StringUtils.isEmpty(param.getAccount()) || StringUtils.isEmpty(param.getPassword())) {
@@ -130,11 +141,12 @@ public class WxMaController extends BaseController {
 
     /**
      * 获取当前用户
+     *
      * @return
      * @throws Exception
      */
     @GetMapping("/current")
-    @ApiOperation(value="获取当前用户", notes = "获取当前用户", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value = "获取当前用户", notes = "获取当前用户", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean current() throws Exception {
         SysUser user = currentUser();
         List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
@@ -151,7 +163,7 @@ public class WxMaController extends BaseController {
     }
 
     @PutMapping("/auth-user")
-    @ApiOperation(value="授权头像", notes = "授权头像", httpMethod = "PUT", response = TaPerson.class)
+    @ApiOperation(value = "授权头像", notes = "授权头像", httpMethod = "PUT", response = TaPerson.class)
     public ResponseBean updateUserInfo(@ApiParam("授权头像的参数") @RequestBody WxMaUitl.AuthParam param) throws Exception {
         // 解密用户信息
         WxMaUserInfo userInfo = wxMaUitl.getUserInfo(param);
@@ -170,7 +182,7 @@ public class WxMaController extends BaseController {
         return ResponseBean.success(taPerson);
     }
 
-    @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
+    @ApiOperation(value = "授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
     @PutMapping("/auth-phone")
     public ResponseBean updateUserPhone(@ApiParam("授权手机的Code") @RequestParam String code) throws Exception {
 
@@ -191,12 +203,12 @@ public class WxMaController extends BaseController {
     }
 
     @PostMapping("/change-password")
-    @ApiOperation(value="修改密码", notes = "修改密码", httpMethod = "POST", response = ResponseBean.class)
+    @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean changePassword(@ApiParam("修改密码") @RequestBody WxChangePwd wxChangePwd) throws Exception {
 
         if (StringUtils.isEmpty(wxChangePwd.getPhone())
-            || StringUtils.isEmpty(wxChangePwd.getCaptcha())
-            || StringUtils.isEmpty(wxChangePwd.getPassword())
+                || StringUtils.isEmpty(wxChangePwd.getCaptcha())
+                || StringUtils.isEmpty(wxChangePwd.getPassword())
         ) {
             return ResponseBean.error("修改密码参数部分为空");
         }

src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 
 spring:
   datasource:
-    url: jdbc:mysql://112.2.2.154:3394/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.89.10:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: civilizedcity
     password: civilizedcity@ABCD1234
     hikari: