【回滚】feign远程调用返回对象

【新增】launch 代码

zd-api/zd-algorithm-api/src/main/java/com/zd/Main.java

@@ -1,12 +0,0 @@
-package com.zd;
-
-/**
- * @创建人 hzw
- * @描述
- * @创建时间 ${DATE}
- */
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}

zd-api/zd-chemical-api/src/main/java/com/zd/chemical/api/fegin/RemoteStockService.java

@@ -2,7 +2,7 @@ package com.zd.chemical.api.fegin;
 
 import com.zd.chemical.api.fegin.factory.RemoteStockFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +19,7 @@ public interface RemoteStockService {
 
 
     @PostMapping(value = "/hxpStock/RFIDCheck")
-    public ResultData<Boolean> rfidCheck(@RequestBody Object tag);
+    public R<Boolean> rfidCheck(@RequestBody Object tag);
 
     @GetMapping(value = "/hxpStock/expireCheck")
     public void expireCheck();
@@ -34,7 +34,7 @@ public interface RemoteStockService {
     public void queryUplinkResult();
 
     @GetMapping(value = "/hxpStock/sendSydSms")
-    public ResultData sendSydSms(@RequestParam(value = "content") String content,
+    public R sendSydSms(@RequestParam(value = "content") String content,
                         @RequestParam(value = "purpose") Integer purpose,
                         @RequestParam(value = "lockApplyId", required = false) Long lockApplyId,
                         @RequestParam(value = "phones") @NotNull String... phones);

zd-api/zd-chemical-api/src/main/java/com/zd/chemical/api/fegin/factory/RemoteStockFallbackFactory.java

@@ -2,7 +2,7 @@ package com.zd.chemical.api.fegin.factory;
 
 
 import com.zd.chemical.api.fegin.RemoteStockService;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -22,9 +22,9 @@ public class RemoteStockFallbackFactory implements FallbackFactory<RemoteStockSe
         logger.error("化学品服务调用失败:{}", throwable.getMessage());
         return new RemoteStockService() {
             @Override
-            public ResultData<Boolean> rfidCheck(Object tag) {
+            public R<Boolean> rfidCheck(Object tag) {
                 logger.error("保存调用失败:{}" ,throwable.getMessage());
-                return ResultData.fail("保存调用失败:" + throwable.getMessage());
+                return R.fail("保存调用失败:" + throwable.getMessage());
             }
 
             @Override
@@ -48,9 +48,9 @@ public class RemoteStockFallbackFactory implements FallbackFactory<RemoteStockSe
             }
 
             @Override
-            public ResultData sendSydSms(String content, Integer purpose, Long lockApplyId, @NotNull String... phones) {
+            public R sendSydSms(String content, Integer purpose, Long lockApplyId, @NotNull String... phones) {
                 logger.error("四医大短信调用失败:{}" ,throwable.getMessage());
-                return ResultData.fail("四医大短信调用失败:" + throwable.getMessage());
+                return R.fail("四医大短信调用失败:" + throwable.getMessage());
             }
 
             @Override

zd-api/zd-system-api/pom.xml

@@ -12,6 +12,6 @@
     <groupId>com.zd.system</groupId>
     <artifactId>zd-system-api</artifactId>
     <packaging>jar</packaging>
-    <description>system-api</description>
+    <description>system接口依赖</description>
 
 </project>

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/RemoteLogService.java

@@ -2,7 +2,7 @@ package com.zd.system.api.feign;
 
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.SecurityConstants;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.system.api.entity.SysLogininfor;
 import com.zd.system.api.entity.SysOperLog;
 import com.zd.system.api.feign.factory.RemoteLogFallback;
@@ -26,7 +26,7 @@ public interface RemoteLogService {
      * @return 结果
      */
     @PostMapping("/operlog")
-    public ResultData<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 保存访问记录
@@ -36,5 +36,5 @@ public interface RemoteLogService {
      * @return 结果
      */
     @PostMapping("/logininfor")
-    public ResultData<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/RemoteUserService.java

@@ -3,7 +3,7 @@ package com.zd.system.api.feign;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.SecurityConstants;
 import com.zd.model.domain.AjaxResult;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.system.api.feign.factory.RemoteUserFallback;
@@ -14,7 +14,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.util.List;
 
 /**
@@ -32,8 +31,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/{username}")
-    ResultData<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
+    R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     /**
      * 通过用户名查询用户信息
      *
@@ -42,8 +40,8 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/{username}/{loginType}")
-    ResultData<LoginUser> getUserInfo(@PathVariable("username") String username, @PathVariable("loginType") Integer loginType,
-                                      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<LoginUser> getUserInfo(@PathVariable("username") String username, @PathVariable("loginType") Integer loginType,
+                                    @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 通过用户ID查询用户信息
@@ -53,7 +51,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/id/{id}")
-    ResultData<SysUser> getUserInfoByUserId(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<SysUser> getUserInfoByUserId(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
     /**
@@ -64,17 +62,16 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/username/{username}")
-    ResultData<SysUser> getUserInfoByUserName(@PathVariable("username") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
+     R<SysUser> getUserInfoByUserName(@PathVariable("username") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     /**
      * 通过用户卡号查询用户信息
      *
      * @param cardnum 用户账户
-     * @param source  请求来源
+     * @param source   请求来源
      * @return 结果
      */
     @GetMapping("/user/info/cardnum/{cardnum}")
-    ResultData<SysUser> getUserInfoByCardNum(@PathVariable("cardnum") String cardnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<SysUser> getUserInfoByCardNum(@PathVariable("cardnum")String cardnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -84,19 +81,18 @@ public interface RemoteUserService {
      * @return 结果
      */
     @PostMapping("/user/register")
-    ResultData<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
     @GetMapping("/user/my/info/Simple")
-    ResultData<SimpleUserVO> myInfoSimple(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
+     R<SimpleUserVO> myInfoSimple(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     /**
      * 获取所有可用户IDS
      *
      * @return 结果
      */
     @GetMapping("/user/all")
-    ResultData<List<Long>> userALLIDS(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<List<Long>> userALLIDS(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
     /**
@@ -105,8 +101,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/phone/{ids}")
-    ResultData<List<String>> getPhoneByUserIDS(@PathVariable("ids") String ids);
-
+     R<List<String>> getPhoneByUserIDS(@PathVariable("ids") String ids);
     /**
      * 获取指定院系用户IDS
      *
@@ -114,7 +109,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/dept/{deptIds}")
-    ResultData<List<Long>> userDeptIDS(@PathVariable("deptIds") String deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+     R<List<Long>> userDeptIDS(@PathVariable("deptIds") String deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
     /**
@@ -122,7 +117,7 @@ public interface RemoteUserService {
      */
     @ApiOperation(value = "小程序查询院系列表（用户端，管理端）")
     @GetMapping(value = "/dept/departments/list")
-    ResultData<Object> departmentsList();
+     R<Object> departmentsList();
 
 
     /**
@@ -130,7 +125,7 @@ public interface RemoteUserService {
      */
     @ApiOperation(value = "小程序查询院系下楼栋列表（用户端，管理端）")
     @GetMapping(value = "/dept/{deptId}/building/list")
-    ResultData<Object> building(@PathVariable("deptId") Long deptId);
+     R<Object> building(@PathVariable("deptId") Long deptId);
 
     /**
      * 登录查询大屏用户的路由菜单
@@ -142,58 +137,56 @@ public interface RemoteUserService {
      * 大屏用户权限判断
      */
     @GetMapping("/role/authUser/power")
-    AjaxResult selectAuthUserPower(@RequestParam("userId") Long userId);
+     AjaxResult selectAuthUserPower(@RequestParam("userId") Long userId);
 
     /**
      * 修改学生信息
      */
     @PutMapping("/user/student")
-    AjaxResult editUser(@RequestBody SysUser user);
+     AjaxResult editUser(@RequestBody SysUser user);
 
     /**
      * 修改学生信息
      */
     @PutMapping("/user/student/editStudent")
-    ResultData editStudent(@RequestBody SysUser user);
+     AjaxResult editStudent(@RequestBody SysUser user);
 
     @PostMapping(value = "/user/updateSignature", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ResultData updateSignature(@RequestPart("file") MultipartFile file);
+     R updateSignature(@RequestPart("file") MultipartFile file);
 
 
     /**
      * 获取用户默认密码
      */
     @GetMapping("/config/configKey/{configKey}")
-    AjaxResult getConfigKey(@PathVariable("configKey") String configKey);
+     AjaxResult getConfigKey(@PathVariable("configKey") String configKey);
 
     @PostMapping("/user/querySignature")
-    ResultData querySignature();
+    R querySignature();
 
 
     /**
      * 获取用户默认密码
      */
     @GetMapping("/logo/config/getLogoInfo")
-    ResultData<SysLogoConfigVO> getConfigLogo();
+     R<SysLogoConfigVO> getConfigLogo();
 
     @DeleteMapping("/user/{userIds}")
     AjaxResult remove(@PathVariable("userIds") Long[] userIds);
 
     /**
      * 获取当前登录用户所属学校以及院系id集合
-     *
      * @return
      */
     @GetMapping("/user/getLogingUserDeptids")
-    ResultData<List<Long>> getLogingUserDeptids();
+    R<List<Long>> getLogingUserDeptids();
 
     /**
      * 获取当前登录用户所属学校的deptid
-     *
      * @return
      */
     @GetMapping("/user/getLoginUserSchoolDeptid")
-    ResultData<Long> getLoginUserSchoolDeptid();
+    R<Long> getLoginUserSchoolDeptid();
 
     /***
      * 根据电话查询用户信息
@@ -201,5 +194,5 @@ public interface RemoteUserService {
      * @return
      */
     @RequestMapping("/user/getUserByPhone/{phone}")
-    ResultData<SysUser> getUserByPhone(@PathVariable("phone") String phone);
+    R<SysUser> getUserByPhone(@PathVariable("phone") String phone);
 }

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/factory/RemoteLogFallback.java

@@ -1,6 +1,6 @@
 package com.zd.system.api.feign.factory;
 
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.system.api.entity.SysLogininfor;
 import com.zd.system.api.entity.SysOperLog;
 import com.zd.system.api.feign.RemoteLogService;
@@ -23,12 +23,12 @@ public class RemoteLogFallback implements FallbackFactory<RemoteLogService> {
         log.error("日志服务调用失败:{}", throwable.getMessage());
         return new RemoteLogService() {
             @Override
-            public ResultData<Boolean> saveLog(SysOperLog sysOperLog, String source) {
-                return ResultData.fail("日志存储失败："+throwable.getMessage());
+            public R<Boolean> saveLog(SysOperLog sysOperLog, String source) {
+                return R.fail("日志存储失败："+throwable.getMessage());
             }
 
             @Override
-            public ResultData<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source) {
+            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source) {
                 return null;
             }
         };

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/factory/RemoteUserFallback.java

@@ -1,7 +1,7 @@
 package com.zd.system.api.feign.factory;
 
 import com.zd.model.domain.AjaxResult;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.system.api.feign.RemoteUserService;
@@ -31,13 +31,13 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
 
             private static final String MESSAGE_HEAD="获取用户失败:";
             @Override
-            public ResultData<LoginUser> getUserInfo(String username, String source) {
-                return ResultData.fail(MESSAGE_HEAD + throwable.getMessage());
+            public R<LoginUser> getUserInfo(String username, String source) {
+                return R.fail(MESSAGE_HEAD + throwable.getMessage());
             }
 
             @Override
-            public ResultData<LoginUser> getUserInfo(String username, Integer loginType, String source) {
-                return ResultData.fail(MESSAGE_HEAD + throwable.getMessage());
+            public R<LoginUser> getUserInfo(String username, Integer loginType, String source) {
+                return R.fail(MESSAGE_HEAD + throwable.getMessage());
             }
 
             /**
@@ -48,8 +48,8 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return 结果
              */
             @Override
-            public ResultData<SysUser> getUserInfoByUserId(Long id, String source) {
-                return ResultData.fail(MESSAGE_HEAD + throwable.getMessage());
+            public R<SysUser> getUserInfoByUserId(Long id, String source) {
+                return R.fail(MESSAGE_HEAD + throwable.getMessage());
             }
 
             /**
@@ -60,8 +60,8 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return 结果
              */
             @Override
-            public ResultData<SysUser> getUserInfoByUserName(String userName, String source) {
-                return ResultData.fail(MESSAGE_HEAD + throwable.getMessage());
+            public R<SysUser> getUserInfoByUserName(String userName, String source) {
+                return R.fail(MESSAGE_HEAD + throwable.getMessage());
             }
             /**
              * 通过用户卡号查询用户信息
@@ -71,25 +71,25 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return 结果
              */
             @Override
-            public ResultData<SysUser> getUserInfoByCardNum(String userName, String source) {
-                return ResultData.fail("通过用户卡号查询用户信息失败:" + throwable.getMessage());
+            public R<SysUser> getUserInfoByCardNum(String userName, String source) {
+                return R.fail("通过用户卡号查询用户信息失败:" + throwable.getMessage());
             }
 
 
 
             @Override
-            public ResultData<Boolean> registerUserInfo(SysUser sysUser, String source) {
-                return ResultData.fail("注册用户失败:" + throwable.getMessage());
+            public R<Boolean> registerUserInfo(SysUser sysUser, String source) {
+                return R.fail("注册用户失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<SimpleUserVO> myInfoSimple(String source) {
-                return ResultData.fail("查询当前用户简略信息失败:" + throwable.getMessage());
+            public R<SimpleUserVO> myInfoSimple(String source) {
+                return R.fail("查询当前用户简略信息失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<List<Long>> userALLIDS(String source) {
-                return ResultData.fail("获取所有用户ID失败:" + throwable.getMessage());
+            public R<List<Long>> userALLIDS(String source) {
+                return R.fail("获取所有用户ID失败:" + throwable.getMessage());
             }
 
             /**
@@ -99,23 +99,23 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return 结果
              */
             @Override
-            public ResultData<List<String>> getPhoneByUserIDS(String ids) {
-                return ResultData.fail("获取所有用户手机号失败:" + throwable.getMessage());
+            public R<List<String>> getPhoneByUserIDS(String ids) {
+                return R.fail("获取所有用户手机号失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<List<Long>> userDeptIDS(String deptId, String source) {
-                return ResultData.fail("获取院系下用户ID失败:" + throwable.getMessage());
+            public R<List<Long>> userDeptIDS(String deptId, String source) {
+                return R.fail("获取院系下用户ID失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> departmentsList() {
-                return ResultData.fail("获取小程序查询院系列表失败:" + throwable.getMessage());
+            public R<Object> departmentsList() {
+                return R.fail("获取小程序查询院系列表失败:" + throwable.getMessage());
             }
 
             @Override
-            public ResultData<Object> building(Long deptId) {
-                return ResultData.fail("获取小程序查询院系下楼栋列表失败:" + throwable.getMessage());
+            public R<Object> building(Long deptId) {
+                return R.fail("获取小程序查询院系下楼栋列表失败:" + throwable.getMessage());
             }
 
             @Override
@@ -132,11 +132,11 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
             public AjaxResult editUser(SysUser user) { return AjaxResult.error("学生信息更新失败：" + throwable.getMessage()); }
 
             @Override
-            public ResultData editStudent(SysUser user) { return ResultData.fail("安全准入学生信息更新失败：" + throwable.getMessage()); }
+            public AjaxResult editStudent(SysUser user) { return AjaxResult.error("安全准入学生信息更新失败：" + throwable.getMessage()); }
 
             @Override
-            public ResultData updateSignature(MultipartFile file) {
-                return ResultData.fail("修改签名信息失败：" + throwable.getMessage());
+            public R updateSignature(MultipartFile file) {
+                return R.fail("修改签名信息失败：" + throwable.getMessage());
             }
 
             @Override
@@ -145,13 +145,13 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
             }
 
             @Override
-            public ResultData querySignature() {
-                return ResultData.fail("查询签名信息失败：" + throwable.getMessage());
+            public R querySignature() {
+                return R.fail("查询签名信息失败：" + throwable.getMessage());
             }
 
             @Override
-            public ResultData <SysLogoConfigVO> getConfigLogo() {
-                return ResultData.fail("查询一体机logo信息失败：" + throwable.getMessage());
+            public R <SysLogoConfigVO> getConfigLogo() {
+                return R.fail("查询一体机logo信息失败：" + throwable.getMessage());
             }
 
             @Override
@@ -165,8 +165,8 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return
              */
             @Override
-            public ResultData<List<Long>> getLogingUserDeptids() {
-                return ResultData.fail("获取登录用户所属学校及院系失败:" + throwable.getMessage());
+            public R<List<Long>> getLogingUserDeptids() {
+                return R.fail("获取登录用户所属学校及院系失败:" + throwable.getMessage());
             }
 
             /**
@@ -175,8 +175,8 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return
              */
             @Override
-            public ResultData<Long> getLoginUserSchoolDeptid() {
-                return ResultData.fail("获取当前登录用户所属学校的deptid失败:" + throwable.getMessage());
+            public R<Long> getLoginUserSchoolDeptid() {
+                return R.fail("获取当前登录用户所属学校的deptid失败:" + throwable.getMessage());
             }
 
             /***
@@ -185,8 +185,8 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
              * @return
              */
             @Override
-            public ResultData<SysUser> getUserByPhone(String phone) {
-                return ResultData.fail("根据电话查询用户信息失败:" + throwable.getMessage());
+            public R<SysUser> getUserByPhone(String phone) {
+                return R.fail("根据电话查询用户信息失败:" + throwable.getMessage());
             }
 
 

zd-auth/pom.xml

@@ -23,11 +23,7 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
-        <!-- zd Common Swagger -->
-       <!-- <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-swagger</artifactId>
-        </dependency>-->
+
         <!-- SpringCloud Alibaba Sentinel -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -35,30 +31,31 @@
         </dependency>
 
         <!-- SpringBoot Actuator -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- zd Common Security-->
         <dependency>
             <groupId>com.zd.core</groupId>
             <artifactId>common-core</artifactId>
-            <version>3.1.0</version>
+            <version>${zd.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.baomidou</groupId>
                     <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.8.Final</version>
+            <groupId>com.zd.chemical</groupId>
+            <artifactId>zd-chemical-api</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.zd.auth.form.LoginBody;
 import com.zd.auth.form.RegisterBody;
 import com.zd.auth.service.SysLoginService;
+import com.zd.chemical.api.fegin.RemoteStockService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.security.TokenService;
@@ -11,6 +12,7 @@ import com.zd.common.core.utils.IdUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.model.constant.*;
 import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.system.api.feign.RemoteUserService;

zd-auth/src/main/java/com/zd/auth/service/SysLoginService.java

@@ -6,7 +6,7 @@ import com.zd.model.constant.BaseConstants;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.constant.SecurityConstants;
 import com.zd.model.constant.UserConstants;
-import com.zd.model.domain.ResultData;
+import com.zd.model.domain.R;
 import com.zd.model.enums.UserStatus;
 import com.zd.model.entity.LoginUser;
 import com.zd.system.api.entity.SysLogininfor;

zd-common/common-core/src/main/java/com/zd/common/core/launch/StartEventListener.java

@@ -0,0 +1,30 @@
+package com.zd.common.core.launch;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.util.StringUtils;
+
+
+@Configuration
+public class StartEventListener {
+    private static final Logger log = LoggerFactory.getLogger(StartEventListener.class);
+
+    public StartEventListener() {}
+
+    @Async
+    @Order
+    @EventListener({WebServerInitializedEvent.class})
+    public void afterStart(WebServerInitializedEvent event) {
+        Environment environment = event.getApplicationContext().getEnvironment();
+        String appName = environment.getProperty("spring.application.name").toUpperCase();
+        int localPort = event.getWebServer().getPort();
+        String profile = StringUtils.arrayToCommaDelimitedString(environment.getActiveProfiles());
+        log.info("---[{}]---启动完成，当前使用的端口:[{}]，环境变量:[{}]---", new Object[]{appName, localPort, profile});
+    }
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/ZdStartApplication.java

@@ -0,0 +1,102 @@
+package com.zd.common.core.launch;
+
+import com.zd.common.core.launch.constant.LauncherConstant;
+import com.zd.common.core.launch.constant.NacosProperty;
+import com.zd.common.core.launch.service.LauncherService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.*;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>启动类</p>
+ *
+ * @author linft
+ * @version 1.0
+ * @date 10/17/2022
+ */
+public class ZdStartApplication {
+    private static final Logger log = LoggerFactory.getLogger(ZdStartApplication.class);
+
+    public ZdStartApplication() {}
+    public static ConfigurableApplicationContext run(String appName, Class<?> source, String... args) {
+        SpringApplicationBuilder builder = createSpringApplicationBuilder(appName, source, args);
+        return builder.run(args);
+    }
+
+    public static SpringApplicationBuilder createSpringApplicationBuilder(String appName, Class<?> source, String... args) {
+        Assert.hasText(appName, "[appName]服务名不能为空");
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        MutablePropertySources propertySources = environment.getPropertySources();
+        propertySources.addFirst(new SimpleCommandLinePropertySource(args));
+        propertySources.addLast(new MapPropertySource("systemProperties", environment.getSystemProperties()));
+        propertySources.addLast(new SystemEnvironmentPropertySource("systemEnvironment", environment.getSystemEnvironment()));
+        String[] activeProfiles = environment.getActiveProfiles();
+        List<String> profiles = Arrays.asList(activeProfiles);
+        List<String> activeProfileList = new ArrayList<>(profiles);
+        Function<Object[], String> joinFun = StringUtils::arrayToCommaDelimitedString;
+        SpringApplicationBuilder builder = new SpringApplicationBuilder(source);
+        String profile;
+        if (activeProfileList.isEmpty()) {
+            profile = "dev";
+            activeProfileList.add(profile);
+            builder.profiles(profile);
+        } else {
+            if (activeProfileList.size() != 1) {
+                throw new RuntimeException("同时存在环境变量:[" + StringUtils.arrayToCommaDelimitedString(activeProfiles) + "]");
+            }
+
+            profile = activeProfileList.get(0);
+        }
+
+        String startJarPath = Objects.requireNonNull(ZdStartApplication.class.getResource("/")).getPath().split("!")[0];
+        String activePros = joinFun.apply(activeProfileList.toArray());
+        System.out.printf("----启动中，读取到的环境变量:[%s]，jar地址:[%s]----%n", activePros, startJarPath);
+        Properties props = System.getProperties();
+        props.setProperty("spring.application.name", appName);
+        props.setProperty("spring.profiles.active", profile);
+        props.setProperty("service.version", "1.0.0");
+        props.setProperty("service.name", appName);
+        props.setProperty("service.env", profile);
+        props.setProperty("service.is-local", String.valueOf(isLocalDev()));
+        props.setProperty("service.dev-mode", profile.equals("pro") ? "false" : "true");
+        props.setProperty("spring.main.allow-bean-definition-overriding", "true");
+        String addr =  LauncherConstant.nacosAddr(profile);
+        props.setProperty("spring.cloud.nacos.discovery.server-addr", addr);
+        props.setProperty("spring.cloud.nacos.config.server-addr", addr);
+       /* props.setProperty("spring.cloud.nacos.discovery.server-addr", "127.0.0.1:8848");
+        props.setProperty("spring.cloud.nacos.config.server-addr", "127.0.0.1:8848");*/
+
+        String nameSpace =  LauncherConstant.nacosNameSpace(profile);
+        if (nameSpace != null && !"".equals(nameSpace)) {
+            props.setProperty("spring.cloud.nacos.discovery.namespace", nameSpace);
+            props.setProperty("spring.cloud.nacos.config.namespace", nameSpace);
+        }
+
+        String prefixName = LauncherConstant.DATA_IS_SINGLE?LauncherConstant.NACOS_CONFIG_NAME:appName;
+        props.setProperty("spring.cloud.nacos.config.prefix", prefixName);
+        props.setProperty("spring.cloud.nacos.config.file-extension", "yml");
+        props.setProperty("spring.cloud.nacos.config.shared-configs", "application.yml");
+        //props.setProperty("spring.cloud.nacos.config.extension-configs[0].data-id", "application.yml");
+
+        log.info("------ nacos配置信息  addr:[{}]---namespace:[{}]，prefixName:[{}]---", new Object[]{addr, nameSpace, prefixName});
+        List<LauncherService> launcherList = new ArrayList<>();
+        ServiceLoader.load(LauncherService.class).forEach(launcherList::add);
+        (launcherList.stream().sorted(Comparator.comparing(LauncherService::getOrder)).collect(Collectors.toList()))
+                .forEach((launcherService) -> launcherService.launcher(builder, appName, profile));
+        return builder;
+    }
+
+    public static boolean isLocalDev() {
+        String osName = System.getProperty("os.name");
+        return StringUtils.hasText(osName) && !"LINUX".equalsIgnoreCase(osName);
+    }
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/constant/LauncherConstant.java

@@ -0,0 +1,62 @@
+package com.zd.common.core.launch.constant;
+
+
+/**
+ * <p>启动服务常两</p>
+ *
+ * @author linft
+ * @version 1.0
+ * @date 10/17/2022
+ */
+public interface LauncherConstant {
+
+	Boolean DATA_IS_SINGLE = Boolean.FALSE;
+
+	String NACOS_CONFIG_NAME = "zd";
+
+	String NACOS_DEV_ADDR = "127.0.0.1:8848";
+
+	String NACOS_TEST_ADDR = "192.168.1.24:8848";
+
+	String NACOS_PRO_ADDR = "192.0.0.1:8848";
+
+	String NACOS_DEV_NAMESPACE = "";
+
+	String NACOS_TEST_NAMESPACE = "668645db-56eb-4f96-aa27-35fe8aff386d";
+
+	String NACOS_PRO_NAMESPACE = "";
+
+	/**
+	 * 动态获取nacos地址
+	 *
+	 * @param profile 环境变量
+	 * @return addr
+	 */
+	static String nacosAddr(String profile) {
+		switch (profile) {
+			case ("pro"):
+				return NACOS_PRO_ADDR;
+			case ("test"):
+				return NACOS_TEST_ADDR;
+			default:
+				return NACOS_DEV_ADDR;
+		}
+	}
+
+	/**
+	 * 动态获取namespace id
+	 *
+	 * @param profile 环境变量
+	 * @return addr
+	 */
+	static String nacosNameSpace(String profile) {
+		switch (profile) {
+			case ("pro"):
+				return NACOS_PRO_NAMESPACE;
+			case ("test"):
+				return NACOS_TEST_NAMESPACE;
+			default:
+				return NACOS_DEV_NAMESPACE;
+		}
+	}
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/constant/NacosProperty.java

@@ -0,0 +1,8 @@
+package com.zd.common.core.launch.constant;/**
+* <p>类注释说明</p>
+*
+*@author linft
+*@date 10/18/2022
+*@version 1.0
+*/public class NacosProperty {
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/service/LauncherService.java

@@ -0,0 +1,24 @@
+package com.zd.common.core.launch.service;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.core.Ordered;
+
+/**
+ * 启动配置读取类
+ *
+ * @author linft
+ * @version 1.0
+ * @date 10/17/2022
+ */
+public interface LauncherService extends Ordered, Comparable<LauncherService> {
+
+    void launcher(SpringApplicationBuilder builder, String appName, String profile);
+
+    default int compareTo(LauncherService o) {
+        return Integer.compare(this.getOrder(), o.getOrder());
+    }
+
+    default int getOrder() {
+        return -2147483648;
+    }
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/service/LauncherServiceImpl.java

@@ -0,0 +1,35 @@
+package com.zd.common.core.launch.service;
+
+
+import com.zd.common.core.launch.constant.LauncherConstant;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import java.util.Properties;
+
+/**
+ * 启动配置实现
+ *
+ * @author linft
+ * @version 1.0
+ * @date 10/17/2022
+ */
+public class LauncherServiceImpl implements LauncherService {
+
+    @Override
+    public void launcher(SpringApplicationBuilder builder, String appName, String profile) {
+        Properties props = System.getProperties();
+
+        props.setProperty("spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
+        props.setProperty("spring.cloud.nacos.discovery.namespace", LauncherConstant.nacosNameSpace(profile));
+        props.setProperty("spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
+        props.setProperty("spring.cloud.nacos.config.namespace",LauncherConstant.nacosNameSpace(profile));
+
+        /*try {
+            String hostName = InetAddress.getLocalHost().getHostName();
+            if ("LAPTOP-70VVJB1B".equals(hostName)) {
+                props.setProperty("spring.cloud.nacos.discovery.namespace", "fc4be65b-b38f-433c-86f8-a2e7ccb062c9");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }*/
+    }
+}