Merge branch 'prod2.x' into dev

# Conflicts:
#	PAS/src/main/resources/application.yml

PAS/pom.xml

@@ -165,7 +165,7 @@
     </dependencies>
 
     <build>
-        <finalName>PAS_TEST</finalName>
+        <finalName>PAS_PROD2.0</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

PAS/src/main/java/cn/cslg/pas/common/model/PersonnelVO.java

@@ -123,6 +123,10 @@ public class PersonnelVO {
      * 角色类型(是否为管理角色)
      */
     private Integer roleType;
+    /**
+     * 租户类型
+     */
+    private String tenantType;
 
     /**
      * 部门职位绑定关系

PAS/src/main/java/cn/cslg/pas/controller/CustomAnalysisItemController.java

@@ -41,7 +41,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/saveAs")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "新增分析项")
     public String add(@RequestBody CustomAnalysisItem customAnalysisItem) {
@@ -55,7 +55,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/save")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑分析项")
     public String edit(@RequestBody CustomAnalysisItem customAnalysisItem) {
@@ -63,7 +63,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/groupModify")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/delete/{id}")
     @Operation(summary = "删除分析项")
     public String delete(@PathVariable Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/PatentAnnotationController.java

@@ -31,7 +31,7 @@ public class PatentAnnotationController {
     private final PatentAnnotationService patentAnnotationService;
 
     @checkAuth(FunId = "/workspace/details/notes/list")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @GetMapping("list")
     @Operation(summary = "注释列表")
     public String getPageList(PatentAnnotationVO params) {
@@ -39,7 +39,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择注释")
     public String add(@RequestBody PatentAnnotation patentAnnotation) {
@@ -47,7 +47,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/modify")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑注释")
     public String edit(@RequestBody PatentAnnotation patentAnnotation) {
@@ -55,7 +55,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/delete")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("delete")
     @Operation(summary = "删除注释")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/PatentApplicantController.java

@@ -48,7 +48,7 @@ public class PatentApplicantController {
     }
 
     @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择申请人")
     public String add(@RequestBody PatentApplicant patentApplicant) {

PAS/src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -60,7 +60,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/folder/isRead")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/read/update")
     @Operation(summary = "修改专利阅读状态")
     public String updatePatentReadStatus(@RequestBody PatentReadVO params) {
@@ -140,7 +140,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/folder/batchOperation/batchIndexing")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/batch/index")
     @Operation(summary = "批量批量专利标引")
     public String patentBatchIndex(@RequestBody PatentBatchIndexVO params) {
@@ -161,7 +161,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/details/indexing")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/index/setting")
     @Operation(summary = "修改专利标引")
     public String updatePatentIndexSetting(@RequestBody PatentIndexSettingVO params) {

PAS/src/main/java/cn/cslg/pas/controller/PatentInventorController.java

@@ -45,7 +45,7 @@ public class PatentInventorController {
     }
 
     @checkAuth(FunId = "/workspace/folder/merge/inventorMerge/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "新增发明人")
     public String add(@RequestBody PatentInventor patentInventor) {

PAS/src/main/java/cn/cslg/pas/controller/PatentLabelController.java

@@ -34,7 +34,7 @@ public class PatentLabelController {
     private final PatentLabelService patentLabelService;
 
     @checkAuth(FunId = "/workspace/details/addLabel")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping
     @Operation(summary = "更新标签")
     public String update(@RequestBody PatentCustomFieldSettingVO params) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectFieldController.java

@@ -38,7 +38,7 @@ public class ProjectFieldController {
     private final ProjectFieldService projectFieldService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/check")
     @GetMapping("list")
     @Operation(summary = "自定义字段列表")
@@ -46,7 +46,7 @@ public class ProjectFieldController {
         return Response.success(projectFieldService.getPageList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/add")
     @PostMapping("add")
     @Operation(summary = "新增自定义字段")
@@ -54,7 +54,7 @@ public class ProjectFieldController {
         return projectFieldService.add(projectField);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑自定义字段")
@@ -62,7 +62,7 @@ public class ProjectFieldController {
         return projectFieldService.edit(projectField);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/delete")
     @PostMapping("delete")
     @Operation(summary = "删除自定义字段")
@@ -96,7 +96,7 @@ public class ProjectFieldController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/copy")
     @PostMapping("copy")
     @Operation(summary = "将自定义字段复制到一个专题库中")

PAS/src/main/java/cn/cslg/pas/controller/ProjectFileController.java

@@ -38,7 +38,7 @@ public class ProjectFileController {
         return Response.success(projectFileService.getPageList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/add")
     @PostMapping("add")
     @Operation(summary = "新增附件")
@@ -46,7 +46,7 @@ public class ProjectFileController {
         return projectFileService.add(projectFile, file);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑附件")
@@ -54,7 +54,7 @@ public class ProjectFileController {
         return projectFileService.edit(projectFile, file);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/delete")
     @PostMapping("delete")
     @Operation(summary = "删除附件")

PAS/src/main/java/cn/cslg/pas/controller/ProjectFolderController.java

@@ -41,7 +41,7 @@ public class ProjectFolderController {
         return Response.success(projectFolderService.getList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/folder_manage/add")
     @PostMapping("add")
     @Operation(summary = "新增文件夹")
@@ -49,14 +49,14 @@ public class ProjectFolderController {
         return projectFolderService.add(projectFolder);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑文件夹")
     public String edit(@RequestBody List<ProjectFolder> folderList, String projectId) {
         return projectFolderService.edit(folderList, Integer.parseInt(projectId));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/folder_manage/delete")
     @PostMapping("delete")
     @Operation(summary = "删除文件夹")
@@ -73,7 +73,7 @@ public class ProjectFolderController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/folder/batchOperation/copy")
     @PostMapping("patent")
     @Operation(summary = "文件夹批量移动、复制专利")

PAS/src/main/java/cn/cslg/pas/controller/ReportController.java

@@ -53,7 +53,7 @@ public class ReportController {
 
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/generateReport")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "创建报告")
     public String add(@RequestBody Report report) {

PAS/src/main/java/cn/cslg/pas/controller/ReportTemplateController.java

@@ -31,7 +31,7 @@ public class ReportTemplateController {
     private final ReportTemplateService reportTemplateService;
     
 //    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/check")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @GetMapping("list")
     @Operation(summary = "模板列表")
     public String getList(TemplateConditionVO params) {
@@ -45,7 +45,7 @@ public class ReportTemplateController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择模板")
     public String add(MultipartFile file, ReportTemplate reportTemplate) {
@@ -54,7 +54,7 @@ public class ReportTemplateController {
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/modify")
     @PostMapping("edit")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @Operation(summary = "编辑模板")
     public String edit(MultipartFile file, ReportTemplate reportTemplate) {
         return reportTemplateService.edit(file, reportTemplate);
@@ -62,7 +62,7 @@ public class ReportTemplateController {
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/delete")
     @PostMapping("delete")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @Operation(summary = "删除模板")
     public String delete(Integer id) {
         return reportTemplateService.delete(id);

PAS/src/main/java/cn/cslg/pas/service/OAuth2Service.java

@@ -143,7 +143,15 @@ public class OAuth2Service {
         String token = jsonObject.get("data").toString();
         PersonnelVO personnelVO = com.alibaba.fastjson2.JSONObject.parseObject(token, PersonnelVO.class);
 
-        return Response.success(personnelVO.getToken());
+        token = personnelVO.getToken();
+        String q = "token:login:token:" + token;
+        String IdS = redisUtil.get(q);
+        PersonnelVO personnelVO2 = cacheUtils.getLoginUser(IdS);
+        String tenantType = personnelVO2.getTenantType();
+        HashMap<Object, Object> loginMap = new HashMap<>();
+        loginMap.put("token", token);
+        loginMap.put("tenantType", tenantType);
+        return Response.success(loginMap);
     }
 
     public String changePwd(String oldPassword, String newPassword) {

PAS/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
       timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/pas_history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver

PAS/src/main/resources/application-prod2.yml

@@ -0,0 +1,26 @@
+spring:
+  redis:
+    host: 47.101.137.223
+    port: 6379
+    database: 3
+    password: Xx0GWxdWQJxx6Swe
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
+  datasource:
+    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: TU5x6IeBi7rl
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        login-username: admin
+        login-password: 123456
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+authorUrl: http://localhost:8871

PAS/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8879
+  port: 8877
 #  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prod2
   jackson:
     default-property-inclusion: non_null
     serialization:
@@ -44,4 +44,4 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-authorUrl: http://localhost:8880
+