v2.1 升级swagger & 调整redis

pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>2.0.2</version>
+            <version>2.1</version>
         </dependency>
 
     </dependencies>

readMe.md

@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
     </dependencies>
 ~~~
@@ -126,7 +126,7 @@ cy:
     quartz: false #是否开启定时任务
     redis: false #是否开启redis缓存
     DecryptParam: false  #参数加密验证
-    CySwagger2Config: true
+    swagger2Config: true
     activiti: true
     #Security 配置
     security:
@@ -173,14 +173,15 @@ http://localhost:8084 访问 代码生成器,可以选择数据库信息 自动
 
 
 ### swaggerUI 
-http://localhost:8084/swagger-ui.html#/  访问swaggerUI
-可以看到当前项目所有的接口详情 并测试接口
 
+`http://localhost:8084/swagger-ui.html#/`  访问swaggerUI
+可以看到当前项目所有的接口详情 并测试接口
 ![swagger](http://learning.91isoft.com:18080/resourceServer/family/upload/mdfiles/95089C91B7B742B5A589156C456AFDDB.png "swagger")
 
+knife4j `http://localhost:8084/doc.html`
 
-## 91isoft_spbt
 
+## 91isoft_spbt
 
 | 版本 | 组件  | 描述 | 维护人 |   
 | ------------ | ------------ | ------------ |------------ |
@@ -193,6 +194,7 @@ http://localhost:8084/swagger-ui.html#/  访问swaggerUI
 | v1.0  | spring-security  | 安全性框架  | cy |
 | v2.0  | springboot2  | springboot2.0升级  | cy |
 | v2.0  | activiti  | 工作流引擎  | cy |
+| v2.1  | swagger2 升级 knife4j  | api文档  | cy |
 
 ### 编码规范
 
@@ -201,6 +203,7 @@ http://localhost:8084/swagger-ui.html#/  访问swaggerUI
 | v1.0  | 李丛阳  | 2018-12-14  | 基础结构搭建 |
 
 ### 数据库设计规范
+
 | 编号  | 类型 | 标题  | 描述  |
 | ------------ | ------------ | ------------ | ------------ |
 | 1  | 表  | 表名  | 小写，单词之间使用下划线  |
@@ -212,6 +215,7 @@ http://localhost:8084/swagger-ui.html#/  访问swaggerUI
 
 
 ### 微服务编码规范
+
 | 编号  | 类型 | 标题  | 描述  |
 | ------------ | ------------ | ------------ | ------------ |
 | 0  | 结构  | 目录规范  | 详见 91isoft_spbt_project|
@@ -252,6 +256,7 @@ ${basedir}/sql
 | v1.0  | multipleDs   | 多数据源     | 关闭 | 是 |
 | v1.0  | dbLod   | 数据库日志     | 关闭 | 是 |
 | v2.0  | activiti   | 工作流     | 关闭 | 是 |
+| v2.1  | knife4j     | 文档     | 开启 | 是 |
 
 ### pageUtil
 
@@ -292,7 +297,7 @@ ${basedir}/sql
 
 1. 文档测试工具 默认开启 可以在`application-dev.yml`中配置`cy.model.entityParam` 为false即为关闭 
 2. 启动项目之后再浏览器访问`http://localhost:8084/swagger-ui.html#/ `
-
+3. 升级knife4j `http://localhost:8084/doc.html`
 
 ### multipleDs
 
@@ -304,7 +309,7 @@ ${basedir}/sql
 1. 日志存数据库 默认关闭 
 2. 在 `resources\logback-spring.xml` 修改`<appender name="DBLog"></appender>`中的配置为自己数据库的信息即可
 
-## seurity（权限）
+### seurity（权限）
 
 #### `application-dev.yml`中`cy.model.security` 下相关配置
 

sql/activiti.sql

+/*oracle*/
+CREATE VIEW v_act_waittasklist AS SELECT
+	A.ID_ AS TASK_ID,
+	A.PROC_INST_ID_ PROC_INST_ID,
+	A.TASK_DEF_KEY_ AS ACT_ID,
+	A.NAME_ AS ACT_NAME,
+	A.ASSIGNEE_ AS ASSIGNEE,
+	A.DELEGATION_ AS DELEGATION_ID,
+	A.DESCRIPTION_ AS DESCRIPTION,
+	TO_CHAR (
+		A.CREATE_TIME_,
+		'YYYY-MM-DD HH24:MI:SS'
+	) AS CREATE_TIME,
+	TO_CHAR (
+		A.DUE_DATE_,
+		'YYYY-MM-DD HH24:MI:SS'
+	) AS DUE_DATE,
+	I.USER_ID CANDIDATE
+FROM
+	ACT_RU_TASK A
+LEFT JOIN (
+	SELECT DISTINCT
+		*
+	FROM
+		(
+			SELECT
+				TASK_ID_,
+				TO_CHAR (USER_ID_) USER_ID
+			FROM
+				ACT_RU_IDENTITYLINK I,
+				ACT_RU_TASK T
+			WHERE
+				TASK_ID_ IS NOT NULL
+			AND USER_ID_ IS NOT NULL
+			AND I.TASK_ID_ = T.ID_
+			AND T.ASSIGNEE_ IS NULL
+			AND TYPE_ = 'candidate'
+			UNION
+				SELECT
+					TASK_ID_,
+					R.USER_ID
+				FROM
+					ACT_RU_IDENTITYLINK I,
+					SYS_ROLE_USER R,
+					ACT_RU_TASK T
+				WHERE
+					I.TASK_ID_ IS NOT NULL
+				AND I.GROUP_ID_ IS NOT NULL
+				AND I.TASK_ID_ = T.ID_
+				AND T.ASSIGNEE_ IS NULL
+				AND TYPE_ = 'candidate'
+				AND I.GROUP_ID_ = R.ROLE_ID
+		) U
+) I -- 候选组和业务上的角色用户表关联 ON A.ID_ = I.TASK_ID_
+
+
+/*mysql*/
+CREATE VIEW v_act_waittasklist AS SELECT
+	A.ID_ AS TASK_ID,
+	A.PROC_INST_ID_ PROC_INST_ID,
+	A.TASK_DEF_KEY_ AS ACT_ID,
+	A.NAME_ AS ACT_NAME,
+	A.ASSIGNEE_ AS ASSIGNEE,
+	A.DELEGATION_ AS DELEGATION_ID,
+	A.DESCRIPTION_ AS DESCRIPTION,
+	-- A.CREATE_TIME_ AS CREATE_TIME,
+	-- A.DUE_DATE_ AS DUE_DATE,
+	date_format(
+		A.CREATE_TIME_,
+		'%Y-%m-%d %H:%i:%S'
+	) AS CREATE_TIME,
+	date_format(
+		A.DUE_DATE_,
+		'%Y-%m-%d %H:%i:%S'
+	) AS DUE_DATE,
+	I.USER_ID AS CANDIDATE
+FROM
+	ACT_RU_TASK A
+LEFT JOIN (
+	SELECT DISTINCT
+		*
+	FROM
+		(
+			SELECT
+				I.TASK_ID_,
+				I.USER_ID_ AS USER_ID
+			FROM
+				ACT_RU_IDENTITYLINK I,
+				ACT_RU_TASK T
+			WHERE
+				TASK_ID_ IS NOT NULL
+			AND USER_ID_ IS NOT NULL
+			AND I.TASK_ID_ = T.ID_
+			AND T.ASSIGNEE_ IS NULL
+			AND TYPE_ = 'candidate'
+			UNION
+				SELECT
+					TASK_ID_,
+					I.GROUP_ID_ AS USER_ID
+				FROM
+					ACT_RU_IDENTITYLINK I,
+					ACT_RU_TASK T
+				WHERE
+					I.TASK_ID_ IS NOT NULL
+				AND I.GROUP_ID_ IS NOT NULL
+				AND I.TASK_ID_ = T.ID_
+				AND T.ASSIGNEE_ IS NULL
+				AND I.TYPE_ = 'candidate'
+		) U
+) I -- 候选组和业务上的角色用户表关联
+ON A.ID_ = I.TASK_ID_
+
+-- 示例
+SELECT * FROM  v_act_waittasklist WHERE ASSIGNEE = '11' OR CANDIDATE = 'user2,admin'
+

sql/clearActiviti.sql

+DELETE FROM `ACT_HI_DETAIL` WHERE 1=1;  -- 删除activiti
+DELETE FROM `ACT_HI_COMMENT` WHERE 1=1; -- 删除activiti附件表
+DELETE FROM `ACT_HI_ATTACHMENT` WHERE 1=1;
+DELETE FROM `ACT_HI_IDENTITYLINK` WHERE 1=1;-- 删除activiti历史角色表
+DELETE FROM `ACT_HI_PROCINST` WHERE 1=1;-- 删除activiti历史流程实例
+DELETE FROM `ACT_HI_VARINST` WHERE 1=1;-- 删除activiti历史流程变量
+DELETE FROM `ACT_PROCDEF_INFO` WHERE 1=1;
+DELETE FROM `ACT_HI_TASKINST` WHERE 1=1;
+DELETE FROM `ACT_HI_ACTINST` WHERE 1=1;
+DELETE FROM `ACT_RU_EVENT_SUBSCR` WHERE 1=1;
+DELETE FROM `ACT_RU_IDENTITYLINK` WHERE 1=1;
+DELETE FROM `ACT_RU_JOB` WHERE 1=1;
+DELETE FROM `ACT_RU_TASK` WHERE 1=1;
+DELETE FROM ACT_RU_VARIABLE	WHERE 1=1	;
+DELETE FROM `ACT_RU_EXECUTION` WHERE 1=1;
+
+-- 流程部署删除
+DELETE FROM `ACT_RE_PROCDEF` WHERE 1=1;
+DELETE FROM `ACT_GE_BYTEARRAY` WHERE 1=1;
+DELETE FROM `ACT_RE_DEPLOYMENT` WHERE 1=1;
+DELETE FROM `ACT_RE_MODEL` WHERE 1=1;

src/main/java/org/rcisoft/business/bspace/controller/BSpaceController.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.bspace.controller;
 
 
 /*固定导入*/
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +29,7 @@ import java.util.List;
 /**
 * Created by cy on 2018-12-17 13:50:52.
 */
+@Api(tags = "空间管理")
 @RestController
 @RequestMapping("/bspace")
 public class BSpaceController extends CyPaginationController<BSpace> {

src/main/resources/application-dev.yml

 server:
-    port: 8084
+    port: 8085
     tomcat:
       max-threads: 300
     servlet:
@@ -108,6 +108,14 @@ jwt:
       register: "/register"
 
 cy:
+  init:
+    permission:
+    - "44"
+    - "51"
+    - "52"
+    - "53"
+    role_undelete: ["8492d7e67ca64809bb6ded8823659866"]
+    user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
   model:
     multipleDs: false
     quartz: false
@@ -115,8 +123,8 @@ cy:
     entityParam: true
     decryptParam: false
     swagger2Config: true
-    activiti: false
-    security:
+    activiti: true
+    security:i
       permit-all:
           permitUnStatic:
             - "/static/**"

src/main/resources/application-prod.yml

 server:
-  port: 8082
-  context-path: / #ContextPath must start with '/' and not end with '/'
-  tomcat:
-    max-threads: 300
+    port: 8085
+    tomcat:
+      max-threads: 300
+    servlet:
+      context-path: /
+      session:
+        timeout: PT480M
+    #uri-encoding: UTF-8
+#  ssl:
+#        key-store: classpath:client1.p12
+#        key-store-password: 123456
+#        key-store-type: PKCS12
+#        key-alias: client1
 
-#logging:
+# logging:   #使用logback-spring 注释掉logging 否则影响
 #  level:
 #    root: INFO
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://127.0.0.1:3306/projectartifacture?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+  url: jdbc:mysql://127.0.0.1:3306/mall?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   username: root
   password: cy
   initial-size: 1
@@ -18,9 +27,28 @@ druid:
   max-active: 20
   test-on-borrow: true
 
+#  power:
+#    url: jdbc:mysql://127.0.0.1:3306/power?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+#    username: root
+#    password: 123456
+#    initial-size: 1
+#    min-idle: 1
+#    max-active: 20
+#    test-on-borrow: true
+#    driverClass: com.mysql.jdbc.Driver
+#  pmiss:
+#    url: jdbc:mysql://127.0.0.1:3306/mall2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+#    username: root
+#    password: 123456
+#    initial-size: 1
+#    min-idle: 1
+#    max-active: 20
+#    test-on-borrow: true
+#    driverClass: com.mysql.jdbc.Driver
+
 
 mybatis:
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: "classpath*:mapper/**/**/*.xml"
 
 
 mapper:
@@ -37,17 +65,37 @@ pagehelper:
 
 
 spring:
-  jackson:
-    default-property-inclusion: non_null
-  http:
-    multipart:
-      max-file-size: 100Mb
-      max-request-size: 1000Mb
+  multipart:
+    max-file-size: 100Mb
+    max-request-size: 1000Mb
   mvc:
     throw-exception-if-no-handler-found: true
   resources:
     add-mappings: false
-
+  freemarker:
+    charset: UTF-8
+    suffix: .ftl
+    template-loader-path: classpath:/templates/
+#  redis:
+#    host: 127.0.0.1
+#    port: 6379
+#    pool:
+#      max-idle: 50
+#      max-active: 1000
+#      min-idle: 5
+#      max-wait: -1
+#    database: 0
+#    password: 123456
+#    timeout: 3600
+springfox:
+  documentation:
+    swagger:
+      v2:
+        path: /api-docs
+#jwtAuth:
+#  header: Authorization
+#  token_header: CyBear
+#  secret_key: base64EncodedSecretKey
 jwt:
   header: Authorization
   secret: mySecret
@@ -55,17 +103,55 @@ jwt:
   tokenHead: "Bearer "
   route:
     authentication:
-      path: auth
-      refresh: refresh
-      register: "auth/register"
+      path: "/login"
+      refresh: "/refresh"
+      register: "/register"
+
+cy:
+  init:
+    permission:
+    - "44"
+    - "51"
+    - "52"
+    - "53"
+    role_undelete: ["8492d7e67ca64809bb6ded8823659866"]
+    user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
+  model:
+    multipleDs: false
+    quartz: false
+    redis: false
+    entityParam: true
+    decryptParam: false
+    swagger2Config: true
+    activiti: true
+    security:i
+      permit-all:
+          permitUnStatic:
+            - "/static/**"
+            - "/webjars/**"
+            - "/v2/**"
+            - "/swagger-resources/**"
+            - "/api-docs/**"
+            - "/auth/**"
+            - "/code/**/**"
+            - "/excelUtil/**"
+            - "/cros/**"
+            - "/**/**"
+          permitStatic: ["/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css"]
+          logoutSuccessUrl: "/login"
+          loginPage: "/login"
+          loginfailureUrl: "/login-error.html"
+
 
 global:
   path:
+    base_upload_location: /working/resource/eduServer/
+    code_generate_location: /code
     video_location: /video
     temp_location: /temp
     file_location: /file
     images_location: /images
   code:
     admin: ROLE_1001
-    teacher: ROLE_1002
-    student: ROLE_1003
+  decryptKey: cyKey
+  resetPassword: 123456
\ No newline at end of file

src/main/resources/logback-spring.xml

@@ -4,9 +4,11 @@
 
     <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>
+            <!--<pattern>
                 %date %-5level %d - %msg%n
-            </pattern>
+            </pattern>-->
+            <!--<pattern>%white(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%C) %highlight(%lsn) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}) - %cyan(%msg%n)</pattern>-->
+            <pattern>%white(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}.%M.%L) - %cyan(%msg%n)</pattern>
         </layout>
     </appender>