登陆

bailuntec-cost-core/pom.xml

@@ -42,6 +42,12 @@
     <dependencies>
 
         <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.6.5</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.bailuntec</groupId>
             <artifactId>bailuntec-cost-api</artifactId>
             <exclusions>

bailuntec-cost-core/src/main/java/com/blt/other/common/util/JwtUtil.java

+package com.blt.other.common.util;
+
+import com.bailuntec.common.JsonUtilByFsJson;
+import lombok.extern.slf4j.Slf4j;
+import org.jose4j.jwk.RsaJsonWebKey;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.jwt.consumer.InvalidJwtException;
+import org.jose4j.jwt.consumer.InvalidJwtSignatureException;
+import org.jose4j.jwt.consumer.JwtConsumer;
+import org.jose4j.jwt.consumer.JwtConsumerBuilder;
+import org.jose4j.lang.JoseException;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/18 11:47 上午
+ */
+@Slf4j
+public class JwtUtil {
+
+    /**
+     * 前缀
+     */
+    public static final String TOKEN_PREFIX = "Bearer ";
+
+    /**
+     * 功能描述: 解密Bailun Sso Token
+     *
+     * @param token jwtToken
+     * @return 当前登陆用户oaUserId
+     */
+    public static void validateToken(String token) {
+        try {
+            JwtConsumer consumer = new JwtConsumerBuilder()
+                    .setVerificationKey(new RsaJsonWebKey(JsonUtilByFsJson.jsonToBean("{\"kty\":\"RSA\",\"use\":\"sig\",\"kid\":\"0a968baa62e99029a973415887029fbd\",\"e\":\"AQAB\",\"n\":\"1hr9F7WGP6jpixp8kxN2E0BUB23EYiR0jSfdZQsN0ljnZfyqORK6fETVMDxDHB-ueekqieKh7UYJO3Cc3ecC2WCP7Z0KDsGcQBFJd0a9_BBktYv1rDnteJF3v43XkM1gi6gBEtXUb_l-mfpp14His6HtGH8W0v0klBOQ8UsBHDZvOHr2ns_qWPn0i6N86EUe1W47dGSy7fbms3nYQEncNFpnug6x39fJyFxpKjHS_63f2r3QRdf8UlHbjoVsHjg9sJ7pznrxDIIK8heRqH4JiutV8LhagPBVSm8UVHNwdi5IfjmVpYDirBrZDJZq7FwhyZE7ua29a3wP2I08qS9yJw\",\"alg\":\"RS256\"}", Map.class)).getPublicKey())
+                    .build();
+            JwtClaims claims = consumer.processToClaims(token.replaceAll(TOKEN_PREFIX, ""));
+            if (claims != null) {
+                System.out.println("认证通过！");
+
+            }
+        } catch (JoseException e) {
+            e.printStackTrace();
+        } catch (InvalidJwtSignatureException e) {
+            e.printStackTrace();
+        } catch (InvalidJwtException e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
+
+}

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/SpecDepartmentCheckConfigController.java

@@ -30,7 +30,6 @@ import java.io.IOException;
 @RequestMapping("/specDepartmentCheckConfig")
 public class SpecDepartmentCheckConfigController {
 
-
     @Resource
     ISpecDepartmentCheckConfigService specDepartmentCheckConfigService;
 
@@ -58,7 +57,7 @@ public class SpecDepartmentCheckConfigController {
 
     @ApiOperation("批量导入数据")
     @PostMapping("/importExcel")
-    public CostResult<Void> importExcel(SpecDepartmentCheckImportExcelReq excel) throws IOException {
+    public CostResult<Void> importExcel(@RequestBody SpecDepartmentCheckImportExcelReq excel) throws IOException {
         specDepartmentCheckConfigService.importExcel(excel);
         return CostResult.success();
     }

bailuntec-cost-core/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
   # 数据源配置
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    #    url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
     username: root
     password: "#7kfnymAM$Y9-Ntf"
@@ -46,8 +46,6 @@ cost:
     purchaseCashierCallbackUrlPost: http://api.fee.bailuntec.com/purchase/other/purchasing/list/detail/CashierCallbackUrl
     costApplyCallbackUrlPost: http://api.fee.bailuntec.com/purchase/other/cost/check/ApplyCallbackUrl
     costCashierCallbackUrlPost: http://api.fee.bailuntec.com/purchase/other/cost/check/CashierCallbackUrl
-    lendCostApplyCallBackUrlPost: http://api.fee.bailuntec.com/purchase/other/cost/check/lend/ApplyCallbackUrl
-    lendCostCashierCallbackUrlPost: http://api.fee.bailuntec.com/purchase/other/cost/check/lend/CashierCallbackUrl
     getBuyDetailApi: http://api.fee.bailuntec.com/purchase/other/purchasing/buy/detail
     getCostDetailApi: http://api.fee.bailuntec.com/purchase/other/cost/finansys/detail
 

bailuntec-cost-core/src/main/resources/mapper/Cost.xml

@@ -25,6 +25,7 @@
                 #{projectType}
             </foreach>
         </if>
+        group by t1.id
         ORDER BY
         t1.id DESC
     </select>
@@ -35,6 +36,7 @@
         FROM cost t1
                  left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
         WHERE t1.cost_no = #{costNo}
+        group by t1.id
         ORDER BY t1.id
             DESC
     </select>
@@ -54,6 +56,7 @@
         <if test=" kindNo!=null and kindNo != ''">and t1.kind_no=#{kindNo}</if>
         <if test=" costStatus!=null and costStatus != ''">and t1.cost_status=#{costStatus}</if>
         <if test=" lendStatus!=null and lendStatus != ''">and t1.lend_status=#{lendStatus}</if>
+        group by t1.id
         ORDER BY
         t1.id DESC
     </select>

bailuntec-cost-core/src/test/java/com/blt/other/common/util/JwtUtilTest.java

+package com.blt.other.common.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/12/18 11:53 上午
+ */
+class JwtUtilTest {
+
+    @Test
+    void validateToken() {
+        JwtUtil.validateToken("Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjBhOTY4YmFhNjJlOTkwMjlhOTczNDE1ODg3MDI5ZmJkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE2MDgyNTkyMzcsImV4cCI6MTYwODI5NTIzNywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi6IOh6aqG5a6-IiwiYXV0aF90aW1lIjoxNjA4MjU5MjM3LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjI5MTg3OTEiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-56eR5oqA5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJNSjAwNzAiLCJVc2VyQ29kZSI6Ik1KNTU2NjY2NCIsIk9hVXNlcklkIjoiMzEwOCIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyMjksXCJOYW1lXCI6XCLnm7TlsZ5cIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.H80leuAixJCRs1knFxuncACUQg6PfILLdsy_uX7P8u_AzB4hkZWxg1Vc7d8MTLzJSvr_AttEuc5cLjgRsF_3lr_y2RD6z4cS-WCMBl-xOJYF4HF3u5ksHYge4wmOScaxwWoy1Kvv5et2EnDS2RHiZbQM9lS6YQr5-3kOX8TmROiU6fxAetNt7_1lqvADbEfSDRU8dMi2nfcPdbberlRaK-GLp5BcJCBx7gRLc8tKrvbdL9xI_raBvgwa73rauMMPOXQaSKd571j1SZsGUKsLO5PNqTwzLarE5aPttHpiolPDUO3o0Iaf7Nv_XzNFEbrvY6Xu2BXdtQH303ObwiSurQ");
+    }
+}