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

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -571,19 +571,19 @@ public class JieLinkServiceImpl implements IJieLinkService {
             StringBuffer uriAddr = new StringBuffer();
             uriAddr.append(jieLinkUri).append(apiUri);
             ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(uriAddr.toString(), httpEntity, JSONObject.class);
-            try {
-                if (HttpStatus.OK.value() == responseEntity.getStatusCode().value()) {
-                    log.debug("pullVisitUserQrCode接口返回信息：" + responseEntity.getBody().toJSONString());
-                    JieLinkResultDto<JSONObject> resultData = JSONObject.toJavaObject(responseEntity.getBody(), JieLinkResultDto.class);
-                    if (StringUtils.equals(resultData.getCode(), "0")) {
-                        JSONObject data = resultData.getData();
-                        if (data.containsKey("qrCodeData")) {
+            try{
+                if(HttpStatus.OK.value() ==responseEntity.getStatusCode().value()) {
+                    log.debug("pullVisitUserQrCode接口返回信息："+responseEntity.getBody().toJSONString());
+                    JSONObject body = responseEntity.getBody();
+                    if(body.containsKey("code") && StringUtils.equals("0",body.getString("code"))){
+                        JSONObject data = body.getJSONObject("data");
+                        if(data.containsKey("qrCodeData")){
                             return data.getString("qrCodeData");
                         } else {
                             return null;
                         }
-                    } else {
-                        log.error("pullVisitUserQrCode接口返回错误信息：" + resultData.getMsg());
+                    }else{
+                        log.error("pullVisitUserQrCode接口返回错误信息："+body.getString("msg"));
                         //请求返回结果错误啦
                         return null;
                     }

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -273,9 +273,9 @@ public class SysUserController extends CyPaginationController<SysUser> {
      * @deprecated 前端生成 二维码
      * 后端返回  base64
      */
-    @GetMapping("/getTradeScan/{personId:\\w+}")
+    @GetMapping("/getTradeScan")
     @ResponseBody
-    public CyResult getTradeScan(@PathVariable String personId) {
+    public CyResult getTradeScan(String personId) {
         // 根据用户id获取personId
         String codeUrl = "";
         if (synchronization)

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -166,7 +166,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                         sysUserList.get(0).setName(u.getUserName());
                         sysUserRepositorys.updateSysUser(sysUserList.get(0));
                     }
-                    u.setPersonId(sysUserList.get(0).getPersonId());
+                    u.setPersonId(UUID.randomUUID().toString());
                     u.setUserId(sysUserList.get(0).getBusinessId());
                 }
             }