'commit'

.idea/compiler.xml

@@ -34,6 +34,9 @@
         <module name="ms-wallet" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="dsCommon" target="21" />
+    </bytecodeTargetLevel>
   </component>
   <component name="EclipseCompilerSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
@@ -46,6 +49,7 @@
       <module name="ds-exam" options="" />
       <module name="dsBase" options="-parameters" />
       <module name="dsBuild" options="-parameters" />
+      <module name="dsCommon" options="" />
       <module name="dsGw" options="" />
       <module name="dsProject" options="" />
     </option>

.idea/encodings.xml

@@ -9,6 +9,8 @@
     <file url="file://$PROJECT_DIR$/dsBase/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsBuild/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsBuild/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsCommon/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsCommon/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gw-openapi/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -13,10 +13,12 @@
         <option value="$PROJECT_DIR$/ds-gw/pom.xml" />
         <option value="$PROJECT_DIR$/ds-build/pom.xml" />
         <option value="$PROJECT_DIR$/rough-dependencies/pom.xml" />
+        <option value="$PROJECT_DIR$/dsCommon/pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/dsCommon/pom.xml" />
         <option value="$PROJECT_DIR$/rough-dependencies/pom.xml" />
       </set>
     </option>

dsBase/pom.xml

@@ -247,6 +247,34 @@
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
+
+        <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
+        <!--JWT,用于鉴权-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java

@@ -27,9 +27,11 @@ public class LoginPersonController extends Controller {
     LoginPersonModel model = new LoginPersonModel();
 
     @Before({POST.class})
-    public void doLogin(String username, String password) {
+    public void doLogin(String username, String password, String platform) {
+        if (StrKit.isBlank(platform)) {
+            platform = "WEB";
+        }
         JSONObject resultJson = new JSONObject();
-        try {
         if (StrKit.isBlank(username)) {
             resultJson.put("success", false);
             resultJson.put("msg", "用户名不允许为空！");
@@ -100,21 +102,23 @@ public class LoginPersonController extends Controller {
         CookieUtil.set(getResponse(), "person_id", loginMap.get("person_id").toString(), false, true);
         CookieUtil.set(getResponse(), "bureau_id", loginMap.get("bureau_id").toString(), false, true);
         CookieUtil.set(getResponse(), "token", token, false, true);
-
+        //添加返回的Token JWT
+        String jwtToken = JwtUtil.generateToken(Integer.parseInt(loginMap.get("identity_id").toString()), loginMap.get("person_id").toString(), loginMap.get("bureau_id").toString());
         resultJson.put("success", true);
         resultJson.put("identity_id", loginMap.get("identity_id").toString());
         resultJson.put("person_id", loginMap.get("person_id").toString());
         resultJson.put("bureau_id", loginMap.get("bureau_id").toString());
         resultJson.put("person_name", loginMap.get("person_name").toString());
+        resultJson.put("jwt", jwtToken);
+        //将此人员的权限信息写入Pika,如果后面的要求登录互踢，可以用来处理互踢
+        //处理逻辑就是：检查此jwt是不是在Pika中存在，存在就是系统派发出去，并且是最后一次用户在此平台登录的TOKEN
+        //如果不存在，就表示此token已过期，踢出即可。
+        RedisKit.set("jwt_" + platform + "_" + loginMap.get("person_id").toString(), jwtToken);
         //根据人员id,获取所有单位信息
         Record r = bm.getBureauInfoByPersonId(loginMap.get("person_id").toString());
         if (r != null) resultJson.put("bureau_name", r.getStr("bureau_name"));
         renderJson(resultJson);
-        } catch (Exception e) {
-            resultJson.put("success", false);
-            resultJson.put("msg", "登录异常！");
-            renderJson(resultJson);
-        }
+
     }
 
 

dsBase/src/main/java/com/dsideal/base/Util/JwtUtil.java

@@ -0,0 +1,73 @@
+package com.dsideal.base.Util;
+
+import cn.hutool.core.date.DateTime;
+import com.dsideal.base.BaseApplication;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JwtUtil {
+    public static final String AUTHORIZATION_STARTER = "Bearer ";
+    public static final String SECRET = BaseApplication.PropKit.get("SECRET");
+
+    /**
+     * 功能：黄海开发的生成JWT函数
+     *
+     * @param identity_id 身份ID
+     * @param person_id   人员ID
+     * @param bureau_id   机构ID
+     * @return JWT签名
+     */
+    public static String generateToken(int identity_id, String person_id, String bureau_id) {
+        // 获取当前日期和时间
+        Date now = new Date();
+        // 格式化日期
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("create_time", now.toString());
+        claims.put("identity_id", identity_id);
+        claims.put("person_id", person_id);
+        claims.put("bureau_id", bureau_id);
+        return AUTHORIZATION_STARTER + Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS256, SECRET).compact();
+    }
+
+    public static Claims getClaims(String token) {
+        if (token.contains(AUTHORIZATION_STARTER)) {
+            token = token.replace(AUTHORIZATION_STARTER, "");
+        }
+        Claims claims;
+        try {
+            claims = Jwts.parser()
+                    .setSigningKey(SECRET)
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            try {
+                claims = Jwts.parser()
+                        .setSigningKey(SECRET.getBytes(StandardCharsets.UTF_8))
+                        .parseClaimsJws(token)
+                        .getBody();
+            } catch (Exception err) {
+                claims = null;
+            }
+        }
+        return claims;
+    }
+
+    public static void main(String[] args) {
+        //GwApplication gw = new GwApplication();
+        String token = generateToken(4, "0b64e31e-a85e-43eb-ba5f-3088d986a8da", "3f7f4c90-645a-4fb9-9902-447846cf1dcc");
+        /**
+         结论：
+         1、JWT的里面有三个关键信息，一个是identity_id,另一个是person_id，还有一个bureau_id
+         */
+        Claims claims = getClaims(token);
+        System.out.println(claims.get("identity_id"));
+        System.out.println(claims.get("person_id"));
+        System.out.println(claims.get("bureau_id"));
+    }
+}

dsBase/src/main/resource/application_dev.yaml

@@ -1,5 +1,7 @@
 # 上传文件的临时路径
 uploadTempPath: c:/Windows/Temp
+# JWT
+SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
 
 mysql:
   # 数据库信息

dsBase/src/main/resource/application_pro.yaml

@@ -1,5 +1,7 @@
 # 上传文件的临时路径
 uploadTempPath: /tmp
+# JWT
+SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
 
 mysql:
   # 数据库信息

dsBase/target/classes/application_dev.yaml

@@ -1,5 +1,7 @@
 # 上传文件的临时路径
 uploadTempPath: c:/Windows/Temp
+# JWT
+SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
 
 mysql:
   # 数据库信息

dsBase/target/classes/application_pro.yaml

@@ -1,5 +1,7 @@
 # 上传文件的临时路径
 uploadTempPath: /tmp
+# JWT
+SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
 
 mysql:
   # 数据库信息