20220715 v1.6.1

acl提供给流程的接口.md

@@ -6,7 +6,7 @@
 ## 鉴权接口
 
 ```http
-POST http://133.96.94.176:12128/api/verification
+POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {

other/sh/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup java -jar /data1/acl/aclTousu.jar > /data1/acl/output.out 2>&1 &

other/sh/stop.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+for i in $(ps -ef|grep aclTousu.jar |grep -v grep|awk '{print $2}')
+do 
+kill -9 $i;
+done
+

pom.xml

@@ -4,19 +4,17 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>acl_tousu</artifactId>
-    <version>1.6</version>
+    <version>1.6.1</version>
 
     <parent>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <groupId>org.springframework.boot</groupId>
-        <version>2.6.7</version>
+        <groupId>com.nokia</groupId>
+        <artifactId>hb_springboot_parent</artifactId>
+        <version>1.0</version>
         <relativePath />
     </parent>
 
     <properties>
         <skipTests>true</skipTests>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -27,12 +25,10 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.76</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -56,6 +52,14 @@
     <build>
         <finalName>aclTousu</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

readme.md

@@ -10,6 +10,8 @@
 
 ## 20220715 更新了acl提供给流程的接口 v1.6
 
+- 1.6.1 FlowUserVo 的属性 district 调整为 area 同时调整 UserDao 相关的sql语句
+
 ## 项目部署信息
 
 192.168.70.125 12128端口

src/main/java/com/nokia/dao/UserDao.java

@@ -30,7 +30,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
                         @Result(column = "org_name", property = "org.orgName"),
         })
         @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district"
+                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district as area"
                         + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c"
                         + " where a.city_id = c.city_id")
         List<FlowUserVo> findToPage();
@@ -38,19 +38,12 @@ public interface UserDao extends BaseMapper<UserEntity> {
         /**
          * 查询登录用户信息
          */
-        // @Select("select user_id as user_id,login_name as login_id,user_name as
-        // user_name ,phone as mobile,email as email, city_id as org_id from
-        // sqmdb_rpt.acl_user where login_name=#{loginId} ")
-        // @Results({
-        // @Result(column = "city_id", property = "org", one = @One(select =
-        // "com.nokia.dao.CityDao.findOrgByCityId"))
-        // })
         @Results({
                         @Result(column = "org_id", property = "org.orgId"),
                         @Result(column = "org_name", property = "org.orgName"),
         })
         @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district"
+                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district as area"
                         + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c"
                         + " where a.city_id = c.city_id and login_name=#{loginId}")
         FlowUserVo getFlowUserVoByLoginId(String loginId);
@@ -63,7 +56,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
                         @Result(column = "org_name", property = "org.orgName"),
         })
         @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district"
+                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district as area"
                         + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c"
                         + " where a.city_id = c.city_id and user_id=#{userId}")
         FlowUserVo getFlowUserVoByUserId(Integer userId);
@@ -83,7 +76,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
         })
         @Select("<script>"
                         + "select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
-                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district"
+                        + " a.city_id as org_id, c.city_name_zh as org_name, a.district as area"
                         + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c, sqmdb_rpt.acl_user_role ur "
                         + " where a.user_id = ur.user_id and a.city_id = c.city_id"
                         + "<if test=\"loginId != null and loginId !=''\">"

src/main/java/com/nokia/vo/FlowUserVo.java

@@ -11,5 +11,6 @@ public class FlowUserVo {
     private String email;
     // private Integer state;
     private FlowOrgVo org;
-    private String district;
+    // 区县 对应 UserEntity 的 district
+    private String area;
 }

src/test/java/com/nokia/MainTest.java

@@ -1,32 +0,0 @@
-package com.nokia;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-
-
-
-@SpringBootTest
-public class MainTest {
-    @Test
-    public void test() {
-        String json;
-        json = "{\"number\": \"abc\"}";
-        JSONObject object = JSON.parseObject(json);
-        System.out.println(object);
-        System.out.println(object.getInteger("number"));
-    }
-
-    @Autowired
-    RedisTemplate<String, Object> redisTemplate;
-
-    @Test
-    public void clearRedisTemplate() {
-        redisTemplate.delete("eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc3NmM5MDg1LTNhNWUtNGVlYS04YWVmLWQzNjFlOGMzMWI5MCJ9.U0MBC0VQgOShNzkv3rkbG39DzWl8oJ8DWqpSkdOwYQZX5Ek-nt-FWUI0GWtKp8ROjZLiKy_WwX3Sagzw1U9I-w");
-        Object o = redisTemplate.opsForValue().get("eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc3NmM5MDg1LTNhNWUtNGVlYS04YWVmLWQzNjFlOGMzMWI5MCJ9.U0MBC0VQgOShNzkv3rkbG39DzWl8oJ8DWqpSkdOwYQZX5Ek-nt-FWUI0GWtKp8ROjZLiKy_WwX3Sagzw1U9I-w");
-        System.out.println(o);
-    }
-}