user(add)

pom.xml

@@ -18,6 +18,17 @@
     </properties>
     <dependencies>
         <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.5</version>
+        </dependency>
+        <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>3.10.2</version>
@@ -49,12 +60,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel-core</artifactId>
-            <version>3.1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
@@ -103,10 +108,6 @@
             <version>0.9.1</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.3.4</version>
@@ -117,12 +118,6 @@
             <version>3.0.0</version>
             <!--<scope>compile</scope>-->
         </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>2.0.32</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -144,6 +139,14 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/mmc/oms/common/AuthHandler.java

@@ -2,7 +2,7 @@ package com.mmc.oms.common;
 
 import com.alibaba.fastjson.JSONArray;
 import com.mmc.oms.jwt.JwtConstant;
-import com.mmc.oms.jwt.JwtUtil;
+
 import com.mmc.oms.model.dto.BaseAccountDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -55,33 +55,6 @@ public class AuthHandler {
         return account;
     }
 
-    public String addLoginCache(Integer userId, Integer roleId, String tokenType, BaseAccountDTO loginInfo) {
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put(JwtConstant.USERIDKEY, userId);
-        map.put(JwtConstant.ROLEIDKEY, roleId);
-        map.put(JwtConstant.TOKEN_TYPE, tokenType);
-        String token = JwtUtil.createJwt(map);
-      //  loginInfo.setTokenPort(tokenType);
-
-        // 缓存登录token-jwt
-        stringRedisTemplate.opsForValue().set(
-                RedisConstant.createLoginTokenKey(tokenType, roleId.toString(), userId.toString()), token,
-                JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
-
-        // 平台PC管理端登录保存-单位的id及无限下级id集合
-        if (JwtConstant.SXTB_ACCOUNT_TOKEN.equals(tokenType)) {
-            /*if (loginInfo.getCompanyInfo() != null && !CollectionUtils.isEmpty(loginInfo.getCompanyInfo().getCompanys())) {
-                List<Integer> companys = loginInfo.getCompanyInfo().getCompanys();
-                this.refreshCompanys(companys, loginInfo.getCompanyInfo().getId());
-                // 置为null--省内存
-                loginInfo.getCompanyInfo().setCompanys(null);
-            }*/
-        }
-        // 缓存登录对象
-        stringRedisTemplate.opsForValue().set(token, JsonUtil.parseObjToJson(loginInfo), JwtConstant.EXPIRATION,
-                TimeUnit.MILLISECONDS);
-        return token;
-    }
 
     /**
      * 更新单位缓存

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -24,8 +24,8 @@ public class RentalOrdersController extends BaseController{
   @ApiOperation(value = "租赁-下单")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
   @PostMapping("feignAddLease")
-  public OrderInfoDTO feignAddLease(@RequestBody LeaseOrderVO param) {
-    return rentalOrdersService.feignAddLease(param);
+  public OrderInfoDTO feignAddLease(HttpServletRequest request, @RequestBody LeaseOrderVO param) {
+    return rentalOrdersService.feignAddLease(request,param);
   }
 
   @ApiOperation(value = "订单-详情")

src/main/java/com/mmc/oms/jwt/JwtUtil.java

-package com.mmc.oms.jwt;
-
-import com.mmc.oms.common.CodeUtil;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtBuilder;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-
-import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
-import java.security.Key;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * @Author small
- * @Date 2023/5/24 16:01
- * @Version 1.0
- */
-public class JwtUtil {
-    /**
-     * 根据map中的信息生成token， tokenId为随机生成码，有效时间为24h
-     *
-     * @param claims 封装到token中的map
-     * @return
-     */
-    public static String createJwt(Map<String, Object> claims) {
-        return createJwt(claims, JwtConstant.EXPIRATION);
-    }
-
-    public static String createJwt(Map<String, Object> claims, long expiration) {
-        SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
-        byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(JwtConstant.BASE64KEY);
-        Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
-        long nowMillis = System.currentTimeMillis();
-        long expMillis = nowMillis + expiration;
-        Date now = new Date(nowMillis);
-        Date exp = new Date(expMillis);
-        JwtBuilder builder = Jwts.builder().setClaims(claims).setId(CodeUtil.randomCode(6)).setIssuedAt(now)
-                .setSubject(JwtConstant.SUBJECT).setIssuer(JwtConstant.ISSUER).signWith(signatureAlgorithm, signingKey)
-                .setExpiration(exp);
-        return builder.compact();
-    }
-
-    /**
-     * 解析前端传来的token，解析成功则返回Claims,解析失败返回null;解析成功后可通过claims获取信息
-     *
-     * @param jwt
-     * @return
-     */
-    public static Claims parseJwt(String jwt) {
-        Claims claims = Jwts.parser().setSigningKey(DatatypeConverter.parseBase64Binary(JwtConstant.BASE64KEY))
-                .parseClaimsJws(jwt).getBody();
-        return claims;
-    }
-
-
-}

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -12,12 +12,17 @@ import com.mmc.oms.model.vo.RentalOrderVO;
 import com.mmc.oms.service.RentalOrdersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -29,14 +34,17 @@ import java.util.stream.Collectors;
 @Service
 public class RentalOrdersServiceImpl implements RentalOrdersService {
 
-  @Autowired private RestTemplate restTemplate;
+    @Autowired
+    private RestTemplate restTemplate;
 
-  @Autowired private RentalOrdersDao rentalOrdersDao;
+    @Autowired
+    private RentalOrdersDao rentalOrdersDao;
 
-  @Autowired private StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
 
     @Override
-  public OrderInfoDTO feignAddLease(LeaseOrderVO param) {
+    public OrderInfoDTO feignAddLease(HttpServletRequest request, LeaseOrderVO param) {
         OrderInfoDO orderInfo = new OrderInfoDO(param);
         // 每天单价
         BigDecimal unitPrice = orderInfo.getUnitPrice();
@@ -54,7 +62,7 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
         receipt.setOrderInfoId(orderInfo.getId());
         receipt.setCreateTime(cdate);
         rentalOrdersDao.insertOrderReceipt(receipt);
-    orderInfo.setBalance(getRemainingBalance(param.getRepoAccountId()));
+        orderInfo.setBalance(getRemainingBalance(request, param.getRepoAccountId()));
         // 将当前的用户id及订单编号存入redis
         OrderInfoDTO dto = orderInfo.buildOrderInfoDTO();
         stringRedisTemplate.opsForValue().set(orderInfo.getOrderNo(), JsonUtil.parseObjToJson(dto));
@@ -100,13 +108,14 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
      * @param repoAccountId
      * @return
      */
-  public BigDecimal getRemainingBalance(Integer repoAccountId) {
-    ResponseEntity<String> response =
-        restTemplate.getForEntity(
-            "http://localhost:8088/payment/repocash/RemainingBalance?repoAccountId="
-                + repoAccountId,
-            String.class);
-    String body = response.getBody();
+    public BigDecimal getRemainingBalance(HttpServletRequest request, Integer repoAccountId) {
+        HttpHeaders headers = new HttpHeaders();
+        //封装请求头
+        headers.add("token", request.getHeader("token"));
+        HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
+        ResponseEntity<String> result4 = restTemplate.exchange("http://localhost:8088/payment/repocash/RemainingBalance?repoAccountId=" + repoAccountId,
+                HttpMethod.GET, formEntity, String.class);
+        String body = result4.getBody();
         BigDecimal bigDecimal = new BigDecimal(body);
         return bigDecimal;
     }

src/main/java/com/mmc/oms/service/RentalOrdersService.java

@@ -8,6 +8,8 @@ import com.mmc.oms.model.qo.OrderInfoQO;
 import com.mmc.oms.model.vo.LeaseOrderVO;
 import com.mmc.oms.model.vo.RentalOrderVO;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Author small @Date 2023/5/26 10:52 @Version 1.0
  */
@@ -16,7 +18,7 @@ public interface RentalOrdersService {
 
   OrderInfoDTO getOrderDetail(String orderNo);
 
-  OrderInfoDTO feignAddLease(LeaseOrderVO param);
+  OrderInfoDTO feignAddLease(HttpServletRequest request, LeaseOrderVO param);
 
   PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser);
 

src/main/resources/application-local.yml

@@ -51,3 +51,4 @@ rabbitmq:
 workFlyerInfoKey: TEST_WORK_FLYER_INFO
 
 
+