20220807

doc/接口文档/acl提供给流程的接口.md

@@ -298,12 +298,12 @@ Connection: close
 ## 根据用户查找角色+城市信息
 
 ```http
-POST http://133.96.94.176:12128/rest/flow/api
+POST http://127.0.0.1:12128/rest/flow/api
 Content-Type: application/json
 
 {
   "callType": "getRoleCityByUserId",
-  "userId": "4"
+  "userId": "13"
 }
 ```
 

doc/接口文档/userTree.json

@@ -1,215 +0,0 @@
-[
-    {
-        "name": "河北省",
-        "child": [
-            {
-                "name": "省公司",
-                "child": [
-                    {
-                        "name": "河北省",
-                        "userName": "王玉龙",
-                        "userId": 24,
-                        "child": []
-                    }
-                ]
-            }
-        ]
-    },
-    {
-        "name": "唐山市",
-        "child": [
-            {
-                "name": "市公司",
-                "child": []
-            },
-            {
-                "name": "路南区",
-                "child": [
-                    {
-                        "name": "路南区",
-                        "userName": "夏杰",
-                        "userId": 236,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "路北区",
-                "child": [
-                    {
-                        "name": "路北区",
-                        "userName": "陈琳",
-                        "userId": 237,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "古冶区",
-                "child": [
-                    {
-                        "name": "古冶区",
-                        "userName": "李志香",
-                        "userId": 224,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "开平区",
-                "child": [
-                    {
-                        "name": "开平区",
-                        "userName": "王跃东",
-                        "userId": 234,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "丰南区",
-                "child": [
-                    {
-                        "name": "丰南区",
-                        "userName": "张力山",
-                        "userId": 235,
-                        "child": []
-                    },
-                    {
-                        "name": "丰南区",
-                        "userName": "冯雪征",
-                        "userId": 240,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "丰润区",
-                "child": [
-                    {
-                        "name": "丰润区",
-                        "userName": "刘雅光",
-                        "userId": 223,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "曹妃甸区",
-                "child": [
-                    {
-                        "name": "曹妃甸区",
-                        "userName": "苏晓辉",
-                        "userId": 226,
-                        "child": []
-                    },
-                    {
-                        "name": "曹妃甸区",
-                        "userName": "贾鹏莹",
-                        "userId": 232,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "滦南县",
-                "child": [
-                    {
-                        "name": "滦南县",
-                        "userName": "王晓红",
-                        "userId": 228,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "乐亭县",
-                "child": [
-                    {
-                        "name": "乐亭县",
-                        "userName": "苏惠芳",
-                        "userId": 225,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "迁西县",
-                "child": [
-                    {
-                        "name": "迁西县",
-                        "userName": "程成",
-                        "userId": 220,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "玉田县",
-                "child": [
-                    {
-                        "name": "玉田县",
-                        "userName": "高振宇",
-                        "userId": 221,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "遵化市",
-                "child": [
-                    {
-                        "name": "遵化市",
-                        "userName": "张灵芝",
-                        "userId": 230,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "迁安市",
-                "child": [
-                    {
-                        "name": "迁安市",
-                        "userName": "訾悦馨",
-                        "userId": 233,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "滦州市",
-                "child": [
-                    {
-                        "name": "滦州市",
-                        "userName": "张望然",
-                        "userId": 231,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "海港区",
-                "child": [
-                    {
-                        "name": "海港区",
-                        "userName": "颜君明",
-                        "userId": 229,
-                        "child": []
-                    }
-                ]
-            },
-            {
-                "name": "高开区",
-                "child": [
-                    {
-                        "name": "高开区",
-                        "userName": "王梦云",
-                        "userId": 227,
-                        "child": []
-                    }
-                ]
-            }
-        ]
-    }
-]

doc/部署文档/正式环境/bin/application.properties

@@ -7,31 +7,31 @@ logging.level.com.nokia=debug
 # logging.file.name=log/acl.log
 
 # 测试环境数据库配置
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
-spring.datasource.username=sqmdb
-spring.datasource.password=sqmdb_1QAZ
-
-# 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
-spring.redis.host=192.168.70.125
-spring.redis.port=6379
-spring.redis.database=10
-spring.redis.password=Richr00t
-redis.timeoutSeconds=600
-
-# 正式环境数据源GP数据库配置
 # spring.datasource.driver-class-name=org.postgresql.Driver
-# spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
+# spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
 # spring.datasource.username=sqmdb
 # spring.datasource.password=sqmdb_1QAZ
 
-# 正式环境Redis配置
+# 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
 # spring.redis.host=192.168.70.125
 # spring.redis.port=6379
-# spring.redis.database=0
+# spring.redis.database=10
 # spring.redis.password=Richr00t
 # redis.timeoutSeconds=600
 
+# 正式环境数据源GP数据库配置
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
+spring.datasource.username=sqmdb
+spring.datasource.password=sqmdb_1QAZ
+
+# 正式环境Redis配置
+spring.redis.host=192.168.70.125
+spring.redis.port=6379
+spring.redis.database=0
+spring.redis.password=Richr00t
+redis.timeoutSeconds=600
+
 top.url=http://10.17.180.3/prod-api/verifySystem
 dop.url=http://10.17.180.5:8089/prod-api/verifySystem
 top.api.fromSystem=dh

doc/部署文档/正式环境/正式环境版本更新文档.md

@@ -41,7 +41,7 @@
 
 3. 更新数据库文件
 
-4. 上传并启动新的jar包和配置文件
+4. 上传并启动新的jar包和配置文件（注意检查配置文件环境配置）
 
     ```sh
     # 启动
@@ -164,7 +164,7 @@ Content-Type: application/json
 
 {
   "callType": "get",
-  "userId": "4"
+  "userId": "33"
 }
 ```
 
@@ -176,7 +176,7 @@ Content-Type: application/json
 
 {
   "callType": "findRoleIdByUserId",
-  "userId": "4"
+  "userId": "33"
 }
 ```
 
@@ -200,26 +200,26 @@ Content-Type: application/json
 
 {
   "callType": "findAuthorizedUser",
-  "roleId": "3"
+  "userId": "33"
 }
 ```
 
 - 根据用户查找角色+城市信息
 
 ```http
-POST http://192.168.50.3:12128/rest/flow/api
+POST http://133.96.94.176:12128/rest/flow/api
 Content-Type: application/json
 
 {
   "callType": "getRoleCityByUserId",
-  "userId": "4"
+  "userId": "13"
 }
 ```
 
 - 用户树形结构接口
 
 ```http
-POST http://192.168.50.3:12128/rest/flow/api/userTree
+POST http://133.96.94.176:12128/rest/flow/api/userTree
 Content-Type: application/json
 
 {

src/main/java/com/nokia/controller/FlowApiController.java

@@ -9,6 +9,8 @@ import com.nokia.vo.flow.FlowRoleVo;
 import com.nokia.vo.flow.FlowUserVo;
 import com.nokia.vo.flow.UserTreeReq;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,6 +21,7 @@ import java.util.Map;
 /**
  * 提供给工作流的api
  */
+@Slf4j
 @RestController
 @RequestMapping("rest")
 public class FlowApiController {
@@ -77,6 +80,7 @@ public class FlowApiController {
         }
         List<FlowRoleCityVo> flowRoleCityVos = new ArrayList<>();
         for (Role role : flowService.getRoleCityByUserId(userId)) {
+            log.debug("查询结果：{}", role);
             if ("flow".equals(role.getSystem())) {
                 flowRoleCityVos.add(new FlowRoleCityVo(role));
             }

src/main/resources/application.properties

@@ -7,10 +7,10 @@ logging.level.com.nokia=debug
 # logging.file.name=log/acl.log
 
 # 测试环境数据库配置
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
-spring.datasource.username=sqmdb
-spring.datasource.password=sqmdb_1QAZ
+# spring.datasource.driver-class-name=org.postgresql.Driver
+# spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
+# spring.datasource.username=sqmdb
+# spring.datasource.password=sqmdb_1QAZ
 
 # 测试环境redis配置 由于测试环境redis尚不具备，暂时先用正式环境的 10 顶替一下，具备后再调整
 spring.redis.host=192.168.70.125
@@ -20,10 +20,10 @@ spring.redis.password=Richr00t
 redis.timeoutSeconds=600
 
 # 正式环境数据源GP数据库配置
-# spring.datasource.driver-class-name=org.postgresql.Driver
-# spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
-# spring.datasource.username=sqmdb
-# spring.datasource.password=sqmdb_1QAZ
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://192.168.70.109:5432/sqmmt
+spring.datasource.username=sqmdb
+spring.datasource.password=sqmdb_1QAZ
 
 # 正式环境Redis配置
 # spring.redis.host=192.168.70.125

src/test/java/com/nokia/service/UserServiceTest.java

@@ -7,25 +7,15 @@ import java.io.IOException;
 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;
-
 import com.nokia.pojo.User;
 import com.nokia.pojo.UserRoleCity;
 
 @SpringBootTest
 public class UserServiceTest {
 
-    @Autowired
-    private RedisTemplate redisTemplate;
-
     @Autowired
     private UserService userService;
 
-    @Test
-    void cleanRedis() {
-        redisTemplate.delete("test_token_baoding");
-    }
-
     @Test
     void testGetByLoginName() {
         User user = userService.getByLoginName("test_abc");