Merge branch 'master' of http://git.tbd.yanzuoguang.com/pd-new/pd-user

prod.cmd

@@ -12,11 +12,7 @@ SET SH=%SH% pd-user:latest --spring.profiles.active=prod --yzg.config.url=/home/
 
 
 if 1 equ 1 (
-    java_docker -ssh root@spd1 -sh "%SH%"
-
-    TIMEOUT /T 60
-
-    java_docker -mcc -ssh root@spd2 -sh "%SH%"
+    java_docker -ssh root@ypd1 -sh "%SH%"
 )
 
 @echo on
\ No newline at end of file

src/main/java/com/pangding/web/authority/controller/UserController.java

@@ -84,7 +84,7 @@ public class UserController {
             }
             return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
         }catch (Exception e){
-              return ResponseResult.error("99", e.getMessage());
+              return (ResponseResult)ResponseResult.error("99", e.getMessage());
         }
 
     }

src/main/java/com/pangding/web/authority/service/company/impl/NewCompanyServiceImpl.java

@@ -121,7 +121,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
         CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), CompanyResVo.class);
         if (StringHelper.isEmpty(companyResVo)) {
             // 公司信息为空
-            return ResponseResult.error("99", "注册信息有误");
+            return (ResponseResult)ResponseResult.error("99", "注册信息有误");
         }
 //        ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
 //        companyResVo.setAddress(req.getCompanyVo().getAddress());
@@ -175,7 +175,7 @@ public class NewCompanyServiceImpl implements NewCompanyService {
             // 错误信息为空，发送验证码成功 修改信息成功
             return responseResult;
         } else {
-            return ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
+            return (ResponseResult)ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
         }
     }
 

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -1341,7 +1341,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), CompanyResVo.class);
         if (StringHelper.isEmpty(companyResVo)) {
             // 公司信息为空
-            return ResponseResult.error("99", "注册信息有误");
+            return (ResponseResult)ResponseResult.error("99", "注册信息有误");
         }
         ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
         companyResVo.setAddress(req.getCompanyVo().getAddress());
@@ -1445,7 +1445,7 @@ public class CompanyServiceImpl implements CompanyService {
             // 错误信息为空，发送验证码成功 修改信息成功
             return responseResult;
         } else {
-            return ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
+            return (ResponseResult)ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
         }
     }
 

src/main/java/com/pangding/web/authority/service/impl/DeviceServiceImpl.java

@@ -64,7 +64,7 @@ public class DeviceServiceImpl implements DeviceService {
     public ResponseResult<DeviceVo> updateDevice(DeviceReqVo req) {
         DeviceVo deviceVo = deviceDao.load(req.getDeviceId(), DeviceVo.class);
         if (StringHelper.isEmpty(deviceVo)) {
-            return ResponseResult.error("99", "设备编号有误");
+            return (ResponseResult)ResponseResult.error("99", "设备编号有误");
         }
         ObjectHelper.writeWithFrom(deviceVo, req);
         deviceDao.update(deviceVo);

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -201,14 +201,14 @@ public class UserServiceImpl implements UserService {
         UserVo userVo = userDao.load(userReqVo, UserVo.class);
         if (!StringHelper.isEmpty(userVo)) {
             // 用户名已存在
-            return ResponseResult.error("99", "该用户名已存在");
+            return (ResponseResult)ResponseResult.error("99", "该用户名已存在");
         }
         try {
             /*将RSA加密后的密码解密*/
             String password = saveUserReqVo.getPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
             String confirmPassword = saveUserReqVo.getConfirmPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
             if (!StringHelper.compare(password, confirmPassword)) {
-                return ResponseResult.error("99", "两次填写的密码不相等");
+                return (ResponseResult)ResponseResult.error("99", "两次填写的密码不相等");
             }
 
             // 验证邀请码是否正确 todo 关联码怎么判断
@@ -289,7 +289,7 @@ public class UserServiceImpl implements UserService {
             }
             return ResponseResult.result("注册成功");
         } catch (Exception e) {
-            return ResponseResult.error("99", e.getMessage());
+            return (ResponseResult)ResponseResult.error("99", e.getMessage());
         }
     }
 

src/main/resources/bootstrap-prod.yml

+spring:
+  cloud:
+    config:
+      label: yidong