Merge branch 'master' of http://124.70.58.209:3000/buzhanyi/ankaibeiProjectManagement

api/src/main/java/com/ankaibei/workflow/api/SysUserApi.java

@@ -6,10 +6,10 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "sysUserApi", url = "${api-url:localhost:8077/api/foreign}")
+@FeignClient(name = "sysUserApi", url = "${api-url:localhost:8077/api}")
 public interface SysUserApi {
 
-    @GetMapping("/admin/upms/user/getUserInfoByUserName")
+    @GetMapping("/foreign/admin/upms/user/getUserInfoByUserName")
     SysUser getUserInfoByUserName(@RequestParam("userName")String userName);
 
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/interceptor/AuthenticationInterceptor.java

@@ -51,7 +51,7 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
             throws Exception {
         String url = request.getRequestURI();
         log.info("拦截**请求路径：{}",url);
-        if(url.startsWith("/api/foreign")){
+        if(url.contains("/foreign/")){
             return true;
         }
         String token = this.getTokenFromRequest(request);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/LoginController.java

@@ -145,6 +145,14 @@ public class LoginController {
         return ResMsg.newInstance(CodeEnum.OK, jsonData);
     }
 
+    public static void main(String[] args) {
+        try {
+            System.out.println("****");
+            System.out.println(RsaUtil.encrypt("123456",ApplicationConstant.PUBLIC_KEY));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     /**
      * 登出操作。同时将Session相关的信息从缓存中删除。
      *

common/common-core/src/main/java/com/ankaibei/workFlow/common/core/constant/ApplicationConstant.java

@@ -106,6 +106,8 @@ public final class ApplicationConstant {
             Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
                     "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|substr|ascii|declare|exec|count|master|into|drop|execute|sleep|extractvalue|updatexml|substring|database|concat|rand)\\b.*)");
 
+    public static final String PUBLIC_KEY =
+            "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpC4QMnbTrQOFriJJCCFFWhlruBJThAEBfRk7pRx1jsAhyNVL3CqJb0tRvpnbCnJhrRAEPdgFHXv5A0RrvFp+5Cw7QoFH6O9rKB8+0H7+aVQeKITMUHf/XMXioymw6Iq4QfWd8RhdtM1KM6eGTy8aU7SO2s69Mc1LXefg/x3yw6wIDAQAB";
     /**
      * 私有构造函数，明确标识该常量类的作用。
      */