|
@@ -30,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.io.UnsupportedEncodingException;
|
|
|
+import java.net.URLDecoder;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -572,25 +574,27 @@ public class WxController extends ApiBaseController {
|
|
|
@ApiImplicitParam(name = "params" , paramType = "body")
|
|
|
})
|
|
|
@PostMapping("/getUserBmdByNameAndToken")
|
|
|
- public Object getUserBmdByNameAndToken(){
|
|
|
+ public Object getUserBmdByNameAndToken() throws UnsupportedEncodingException {
|
|
|
ParameterObject obj = getParameterObject();
|
|
|
obj.checkParameterNotNull("token");
|
|
|
String token = obj.getString("token");
|
|
|
- String callbackUrl = obj.getString("callbackUrl");
|
|
|
+ String url = obj.getString("callbackUrl");
|
|
|
+ String callbackUrl = URLDecoder.decode(url, "UTF-8");
|
|
|
+ logger.info("收到BMD跳转信息令牌和回调:"+token+callbackUrl);
|
|
|
Map result=new HashMap();
|
|
|
if(callbackUrl !=null && !("").equals(callbackUrl) ){
|
|
|
result.put("callbackUrl", callbackUrl);
|
|
|
}
|
|
|
if(token ==null || ("").equals(token) ){
|
|
|
- return AjaxResult.error(303,"无识别令牌",result);
|
|
|
+ return AjaxResult.error(303,"BMD无识别令牌",result);
|
|
|
}
|
|
|
String name=DESdecode(token,"SSB2023BMD");
|
|
|
if(name==null || ("").equals(name)){
|
|
|
- return AjaxResult.error(302,"查无此人",result);
|
|
|
+ return AjaxResult.error(302,"BMD查无此人",result);
|
|
|
}
|
|
|
SysUser user = sysUserService.selectUserByLoginName(name);
|
|
|
if(user==null){
|
|
|
- return AjaxResult.error(302,"查无此人",result);
|
|
|
+ return AjaxResult.error(302,"BMD查无此人",result);
|
|
|
}
|
|
|
// String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(),user.getLoginName(),user.getSalt());
|
|
|
List<Ztree> author = sysUserOrderAuthorService.userAuthorTreeDataFmt(user.getUserId());
|