张延森 3 years ago
parent
commit
005c91f92e

+ 1
- 1
src/main/java/com/yunzhi/nanyang/controller/CommController.java View File

20
 
20
 
21
 @Api(tags = "通用")
21
 @Api(tags = "通用")
22
 @RestController
22
 @RestController
23
-@RequestMapping("/{plat}")
23
+@RequestMapping("/{client}")
24
 public class CommController extends BaseController {
24
 public class CommController extends BaseController {
25
 
25
 
26
     @Autowired
26
     @Autowired

+ 18
- 0
src/main/java/com/yunzhi/nanyang/controller/TaPersonController.java View File

6
 import com.yunzhi.nanyang.common.BaseController;
6
 import com.yunzhi.nanyang.common.BaseController;
7
 import com.yunzhi.nanyang.common.ResponseBean;
7
 import com.yunzhi.nanyang.common.ResponseBean;
8
 import com.yunzhi.nanyang.common.SMSCaptcha;
8
 import com.yunzhi.nanyang.common.SMSCaptcha;
9
+import com.yunzhi.nanyang.common.StringUtils;
10
+import com.yunzhi.nanyang.entity.SysUser;
11
+import com.yunzhi.nanyang.service.ISysUserService;
9
 import com.yunzhi.nanyang.vo.PhoneParam;
12
 import com.yunzhi.nanyang.vo.PhoneParam;
10
 import io.swagger.annotations.Api;
13
 import io.swagger.annotations.Api;
11
 import io.swagger.annotations.ApiOperation;
14
 import io.swagger.annotations.ApiOperation;
41
     @Autowired
44
     @Autowired
42
     public ITaPersonService iTaPersonService;
45
     public ITaPersonService iTaPersonService;
43
 
46
 
47
+    @Autowired
48
+    public ISysUserService iSysUserService;
49
+
44
     @Autowired
50
     @Autowired
45
     public SMSCaptcha smsCaptcha;
51
     public SMSCaptcha smsCaptcha;
46
 
52
 
112
             return ResponseBean.error("待更新人员ID不正确");
118
             return ResponseBean.error("待更新人员ID不正确");
113
         }
119
         }
114
 
120
 
121
+        if (StringUtils.isEmpty(phoneParam.getPhone())) {
122
+            return ResponseBean.error("手机号码为空");
123
+        }
124
+
115
         boolean isOk = smsCaptcha.validate(phoneParam.getPhone(), phoneParam.getCaptcha());
125
         boolean isOk = smsCaptcha.validate(phoneParam.getPhone(), phoneParam.getCaptcha());
116
         if (!isOk) {
126
         if (!isOk) {
117
             return ResponseBean.error("验证码不正确或者已过期");
127
             return ResponseBean.error("验证码不正确或者已过期");
119
 
129
 
120
         taPerson.setPhone(phoneParam.getPhone());
130
         taPerson.setPhone(phoneParam.getPhone());
121
 
131
 
132
+        // 关联系统人员
133
+        SysUser sysUser = iSysUserService.getExistBy("phone", phoneParam.getPhone(), false, true);
134
+        if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
135
+            taPerson.setUserId(sysUser.getUserId());
136
+        }
137
+
122
         if (iTaPersonService.updateById(taPerson)){
138
         if (iTaPersonService.updateById(taPerson)){
139
+
140
+
123
             return ResponseBean.success(taPerson);
141
             return ResponseBean.success(taPerson);
124
         }else {
142
         }else {
125
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
143
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

+ 1
- 0
src/main/java/com/yunzhi/nanyang/controller/WxMaController.java View File

90
         TaPerson taPerson = iTaPersonService.getByOpenId(appid, openid);
90
         TaPerson taPerson = iTaPersonService.getByOpenId(appid, openid);
91
         if (null == taPerson) {
91
         if (null == taPerson) {
92
             taPerson = new TaPerson();
92
             taPerson = new TaPerson();
93
+            taPerson.setAppId(appid);
93
             taPerson.setOpenid(openid);
94
             taPerson.setOpenid(openid);
94
             taPerson.setStatus(Constants.STATUS_NORMAL);
95
             taPerson.setStatus(Constants.STATUS_NORMAL);
95
             taPerson.setCreateDate(LocalDateTime.now());
96
             taPerson.setCreateDate(LocalDateTime.now());

+ 2
- 2
src/main/resources/application.yml View File

9
   enabled: true
9
   enabled: true
10
   unauthorizedUrl: /api/401
10
   unauthorizedUrl: /api/401
11
   filterRuleMap: '{
11
   filterRuleMap: '{
12
+    "/**/sms-captcha": "anon",
12
     "/admin/login": "anon",
13
     "/admin/login": "anon",
13
     "/admin/**": "manager",
14
     "/admin/**": "manager",
14
     "/wx/**/login": "anon",
15
     "/wx/**/login": "anon",
16
+    "/wx/**/**/sms-captcha": "anon",
15
     "/wx/**": "miniapp",
17
     "/wx/**": "miniapp",
16
-    "/**/sms-captcha": "anon",
17
-    "/wx/**/sms-captcha": "anon",
18
     "/**": "anon"
18
     "/**": "anon"
19
   }'
19
   }'
20
 
20