Skip to content

J
jyzb-platform
Commit 94dc3d78 by shenweidong
Options

修改了登录接口产生的bug

parent 98b0bcbc
正在显示 包含 78 行增加 和 426 行删除
jyzb-api/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-api
groupId=com.junmp.jyzb
version=1.0.0
jyzb-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\gold\api\bean\vo\ProductSkuVo.class
com\junmp\gold\api\exception\enums\CompanyExceptionEnum.class
com\junmp\gold\api\exception\enums\ProductExceptionEnum.class
com\junmp\gold\api\bean\dto\ProductProcessDto.class
com\junmp\gold\api\bean\req\ProductSkuReq.class
com\junmp\gold\api\bean\dto\ProductTagDto.class
com\junmp\gold\api\bean\dto\ProductBatchDto.class
com\junmp\gold\api\bean\vo\TagInfoVo.class
com\junmp\gold\api\constant\GoldConstant.class
com\junmp\gold\api\bean\vo\NDefContentVo.class
com\junmp\gold\api\bean\vo\TagInfoVo$TagInfoVoBuilder.class
com\junmp\gold\api\bean\req\DbAccessReq.class
com\junmp\gold\api\util\GenCodeUtil.class
com\junmp\gold\api\bean\req\CompanyReq.class
com\junmp\gold\api\bean\req\ProductBatchReq.class
com\junmp\gold\api\bean\req\ProductTagReq.class
com\junmp\gold\api\bean\dto\SimpleTagDto.class
com\junmp\gold\api\exception\GoldAppException.class
com\junmp\gold\api\bean\req\ProductReq.class
com\junmp\gold\api\bean\vo\AuthAccessVo.class
jyzb-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductTagReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductTagDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\util\GenCodeUtil.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\DbAccessReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\package-info.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\ProductExceptionEnum.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\CompanyExceptionEnum.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\GoldAppException.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\AuthAccessVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductBatchReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\CompanyReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\constant\GoldConstant.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductProcessDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\NDefContentVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductBatchDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductSkuReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\ProductSkuVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\SimpleTagDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\TagInfoVo.java
jyzb-biz/pom.xml
...@@ -17,10 +17,17 @@ ...@@ -17,10 +17,17 @@
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.22</version> <version>1.5.22</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java 0 → 100644
package com.junmp.jyzb.controller;
public class WarehouseController {
}
jyzb-biz/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-biz
groupId=com.junmp.jyzb
version=1.0.0
jyzb-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\gold\controller\ProductSkuController.class
com\junmp\gold\controller\ProductController.class
com\junmp\gold\entity\Product.class
com\junmp\gold\entity\ProductSku.class
com\junmp\gold\doc\ProductBatchDoc.class
com\junmp\gold\controller\LoginController.class
com\junmp\gold\mapper\CompanyMapper.class
com\junmp\gold\doc\ProductSkuDoc.class
com\junmp\gold\controller\ProductBatchController.class
com\junmp\gold\doc\ProductDoc.class
com\junmp\gold\controller\CompanyController.class
com\junmp\gold\service\ProductBatchService.class
com\junmp\gold\entity\Company.class
com\junmp\gold\service\impl\ProductSkuServiceImpl.class
com\junmp\gold\doc\CompanyDoc.class
com\junmp\gold\service\CompanyService.class
com\junmp\gold\mapper\ProductBatchMapper.class
com\junmp\gold\service\ProductSkuService.class
com\junmp\gold\doc\ProductTagDoc.class
com\junmp\gold\entity\ProductTag.class
com\junmp\gold\service\ProductTagService.class
com\junmp\gold\service\impl\CompanyServiceImpl.class
com\junmp\gold\controller\PublicController.class
com\junmp\gold\cache\GoldRedisCache.class
com\junmp\gold\entity\ProductBatch.class
com\junmp\gold\mapper\ProductTagMapper.class
com\junmp\gold\service\impl\ProductBatchServiceImpl.class
com\junmp\gold\mapper\ProductSkuMapper.class
com\junmp\gold\controller\ProductTagController.class
com\junmp\gold\mapper\ProductMapper.class
com\junmp\gold\doc\LoginDoc.class
com\junmp\gold\service\ProductService.class
com\junmp\gold\service\impl\ProductServiceImpl.class
com\junmp\gold\service\impl\ProductTagServiceImpl.class
jyzb-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\LoginDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\mapper\ProductSkuMapper.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\impl\ProductTagServiceImpl.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\CompanyDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\entity\Company.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\ProductTagService.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\entity\Product.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\mapper\ProductMapper.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\ProductController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\ProductTagDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\ProductBatchDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\ProductSkuService.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\ProductBatchService.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\mapper\ProductTagMapper.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\impl\CompanyServiceImpl.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\ProductTagController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\entity\ProductTag.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\mapper\CompanyMapper.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\CompanyService.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\ProductBatchController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\impl\ProductBatchServiceImpl.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\CompanyController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\ProductSkuController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\PublicController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\ProductDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\cache\GoldRedisCache.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\doc\ProductSkuDoc.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\controller\LoginController.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\ProductService.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\impl\ProductSkuServiceImpl.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\mapper\ProductBatchMapper.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\service\impl\ProductServiceImpl.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\entity\ProductBatch.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\gold\entity\ProductSku.java
jyzb-boot/pom.xml
...@@ -12,15 +12,12 @@ ...@@ -12,15 +12,12 @@
<name>jyzb-boot</name> <name>jyzb-boot</name>
<dependencies> <dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>p6spy</groupId> <groupId>p6spy</groupId>
<artifactId>p6spy</artifactId> <artifactId>p6spy</artifactId>
......
jyzb-boot/src/main/resources/application-local.yml
...@@ -25,53 +25,11 @@ knife4j: ...@@ -25,53 +25,11 @@ knife4j:
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# driver-class-name: com.p6spy.engine.spy.P6SpyDriver #com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
# url: jdbc:p6spy:mysql://127.0.0.1:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
url: jdbc:mysql://${MYSQL_HOST:192.168.3.128}:${MYSQL_PORT:3306}/${MYSQL_DB:db_jyzb}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&queryTimeout=2400&nullCatalogMeansCurrent=true
username: junmp
password: 123456
dynamic:
druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
# 连接池的配置信息
# 初始化大小，最小，最大
initial-size: 5
min-idle: 5
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
# 打开PSCache，并且指定每个连接上PSCache的大小
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
#jdbc:mysql://192.168.3.128:3306/db_jyzb?
url: jdbc:mysql://192.168.3.128:3306/db_jyzb?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: junmp username: junmp
password: 123456 password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
#===================== 数据源配置 =====================
redis: redis:
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
...@@ -97,19 +55,18 @@ spring: ...@@ -97,19 +55,18 @@ spring:
#mybatis plus 设置 #mybatis plus 设置
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*.xml #classpath*:org/jeecg/modules/**/xml/*Mapper.xml configuration:
# global-config: cache-enabled: true
# # 关闭MP3.0自带的banner lazy-loading-enabled: true
# banner: false multiple-result-sets-enabled: true
# db-config: map-underscore-to-camel-case: false
# #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; global-config:
# id-type: ASSIGN_ID banner: false
# # 默认数据库表下划线命名 enable-sql-runner: true
# table-underline: true db-config:
# configuration: id-type: assign_id
# # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 table-underline: true
# # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:/mapper/**/*Mapper.xml
# # 返回类型为Map,显示null对应的字段
# call-setters-on-nulls: true
jyzb-boot/src/main/resources/application.yml
...@@ -6,7 +6,7 @@ spring: ...@@ -6,7 +6,7 @@ spring:
#bea同名类进行注册时，准许覆盖注册 #bea同名类进行注册时，准许覆盖注册
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
application: application:
name: gold-app name: jyzb-app
profiles: profiles:
#@spring.active@ #@spring.active@
active: @spring.active@ active: @spring.active@
...@@ -32,17 +32,17 @@ spring: ...@@ -32,17 +32,17 @@ spring:
mybatis-plus: mybatis-plus:
# configuration: configuration:
# cache-enabled: true cache-enabled: true
# lazy-loading-enabled: true lazy-loading-enabled: true
# multiple-result-sets-enabled: true multiple-result-sets-enabled: true
# map-underscore-to-camel-case: false map-underscore-to-camel-case: false
# global-config: global-config:
# banner: false banner: false
# enable-sql-runner: true enable-sql-runner: true
# db-config: db-config:
# id-type: assign_id id-type: assign_id
# table-underline: true table-underline: true
mapper-locations: classpath*:/mapper/**/*Mapper.xml mapper-locations: classpath*:/mapper/**/*Mapper.xml
jyzb-boot/target/classes/application-local.yml
...@@ -25,53 +25,11 @@ knife4j: ...@@ -25,53 +25,11 @@ knife4j:
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# driver-class-name: com.p6spy.engine.spy.P6SpyDriver #com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
# url: jdbc:p6spy:mysql://127.0.0.1:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
url: jdbc:mysql://${MYSQL_HOST:192.168.3.128}:${MYSQL_PORT:3306}/${MYSQL_DB:db_jyzb}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&queryTimeout=2400&nullCatalogMeansCurrent=true
username: junmp
password: 123456
dynamic:
druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
# 连接池的配置信息
# 初始化大小，最小，最大
initial-size: 5
min-idle: 5
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
# 打开PSCache，并且指定每个连接上PSCache的大小
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
#jdbc:mysql://192.168.3.128:3306/db_jyzb?
url: jdbc:mysql://192.168.3.128:3306/db_jyzb?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: junmp username: junmp
password: 123456 password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
#===================== 数据源配置 =====================
redis: redis:
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
...@@ -97,19 +55,18 @@ spring: ...@@ -97,19 +55,18 @@ spring:
#mybatis plus 设置 #mybatis plus 设置
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*.xml #classpath*:org/jeecg/modules/**/xml/*Mapper.xml configuration:
# global-config: cache-enabled: true
# # 关闭MP3.0自带的banner lazy-loading-enabled: true
# banner: false multiple-result-sets-enabled: true
# db-config: map-underscore-to-camel-case: false
# #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; global-config:
# id-type: ASSIGN_ID banner: false
# # 默认数据库表下划线命名 enable-sql-runner: true
# table-underline: true db-config:
# configuration: id-type: assign_id
# # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 table-underline: true
# # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:/mapper/**/*Mapper.xml
# # 返回类型为Map,显示null对应的字段
# call-setters-on-nulls: true
jyzb-boot/target/classes/application.yml
...@@ -6,7 +6,7 @@ spring: ...@@ -6,7 +6,7 @@ spring:
#bea同名类进行注册时，准许覆盖注册 #bea同名类进行注册时，准许覆盖注册
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
application: application:
name: gold-app name: jyzb-app
profiles: profiles:
#local #local
active: local active: local
...@@ -32,17 +32,17 @@ spring: ...@@ -32,17 +32,17 @@ spring:
mybatis-plus: mybatis-plus:
# configuration: configuration:
# cache-enabled: true cache-enabled: true
# lazy-loading-enabled: true lazy-loading-enabled: true
# multiple-result-sets-enabled: true multiple-result-sets-enabled: true
# map-underscore-to-camel-case: false map-underscore-to-camel-case: false
# global-config: global-config:
# banner: false banner: false
# enable-sql-runner: true enable-sql-runner: true
# db-config: db-config:
# id-type: assign_id id-type: assign_id
# table-underline: true table-underline: true
mapper-locations: classpath*:/mapper/**/*Mapper.xml mapper-locations: classpath*:/mapper/**/*Mapper.xml
jyzb-boot/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-boot
groupId=com.junmp.jyzb
version=1.0.0
jyzb-boot/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\jyzb\boot\module\JpJacksonModule.class
com\junmp\jyzb\boot\config\GlobalCorsConfig.class
com\junmp\jyzb\boot\core\handle\GlobalExceptionHandler.class
com\junmp\jyzb\boot\JyzbBootApplication.class
com\junmp\jyzb\boot\config\MapperScanConfiguration.class
com\junmp\jyzb\boot\config\JsonSerializerConfig.class
jyzb-boot/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\config\GlobalCorsConfig.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\core\handle\GlobalExceptionHandler.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\module\JpJacksonModule.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\config\JsonSerializerConfig.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\config\MapperScanConfiguration.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-boot\src\main\java\com\junmp\jyzb\boot\JyzbBootApplication.java
jyzb-business/jyzb-business.iml
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
......
jyzb-process/pom.xml
...@@ -87,11 +87,13 @@ ...@@ -87,11 +87,13 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${mybatis-plus.dynamic.vesion}</version> <version>${mybatis-plus.dynamic.vesion}</version>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
......
jyzb-process/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-process
groupId=com.junmp.jyzb
version=1.0.0
jyzb-process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\junmpProcess\dto\PageDTO.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$15.class
com\junmp\junmpProcess\entity\Process.class
com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class
com\junmp\junmpProcess\dto\json\FormItemProps.class
com\junmp\junmpProcess\mapper\DepartmentsMapper.class
com\junmp\junmpProcess\entity\TemplateGroupBo$TemplateGroupBoBuilder.class
com\junmp\junmpProcess\dto\json\NotifyTypeInfo.class
com\junmp\junmpProcess\dto\json\ChildNode.class
com\junmp\junmpProcess\common\R.class
com\junmp\junmpProcess\utils\BpmnModelUtils.class
com\junmp\junmpProcess\utils\BpmnModelUtils$FlowType.class
com\junmp\junmpProcess\listener\ServiceListener.class
com\junmp\junmpProcess\dto\json\EmailInfo.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$7.class
com\junmp\junmpProcess\mapper\UsersMapper.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$4.class
com\junmp\junmpProcess\controller\MainProcessController.class
com\junmp\junmpProcess\dto\AttachmentDTO.class
com\junmp\junmpProcess\listener\CounterSignListener.class
com\junmp\junmpProcess\vo\TaskDetailVO.class
com\junmp\junmpProcess\vo\OptionVO.class
com\junmp\junmpProcess\utils\DateUtils$3.class
com\junmp\junmpProcess\utils\ExUtils$1.class
com\junmp\junmpProcess\dto\json\NotifyType.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class
com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$1.class
com\junmp\junmpProcess\dto\json\FormOperates.class
com\junmp\junmpProcess\mapper\TemplateGroupMapper.class
com\junmp\junmpProcess\mapper\FormGroupsMapper.class
com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class
com\junmp\junmpProcess\controller\WorkspaceProcessController.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class
com\junmp\junmpProcess\entity\Process$ProcessBuilder.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$12.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$5.class
com\junmp\junmpProcess\controller\BpmnController.class
com\junmp\junmpProcess\dto\HandleDataDTO.class
com\junmp\junmpProcess\entity\Departments$DepartmentsBuilder.class
com\junmp\junmpProcess\exception\GlobalExceptionHandlerResolver.class
com\junmp\junmpProcess\dto\json\ConditionInfo.class
com\junmp\junmpProcess\dto\FlowEngineDTO.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$8.class
com\junmp\junmpProcess\entity\Users.class
com\junmp\junmpProcess\exception\WorkFlowException.class
com\junmp\junmpProcess\vo\OrgTreeVo.class
com\junmp\junmpProcess\entity\FormGroups$FormGroupsBuilder.class
com\junmp\junmpProcess\entity\TemplateGroupBo.class
springfox\documentation\spring\web\WebMvcRequestHandler.class
com\junmp\junmpProcess\common\CommonConstants.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$13.class
com\junmp\junmpProcess\dto\json\LogoInfo.class
com\junmp\junmpProcess\vo\TemplateGroupVo$Template$TemplateBuilder.class
com\junmp\junmpProcess\dto\json\UserInfo.class
com\junmp\junmpProcess\utils\DateUtils$6.class
com\junmp\junmpProcess\vo\TemplateGroupVo.class
com\junmp\junmpProcess\dto\json\flowJson\Inout.class
com\junmp\junmpProcess\listener\CounterSignListener$3.class
com\junmp\junmpProcess\entity\TemplateGroup.class
com\junmp\junmpProcess\config\IdWorkerConfig.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$10.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl.class
com\junmp\junmpProcess\utils\ExUtils$2.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$1.class
com\junmp\junmpProcess\vo\MultiVO.class
com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class
com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class
com\junmp\junmpProcess\utils\DateUtils$5.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$14.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class
com\junmp\junmpProcess\entity\FormGroups.class
com\junmp\junmpProcess\listener\ProcessListener.class
com\junmp\junmpProcess\dto\json\FormItem.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$6.class
com\junmp\junmpProcess\dto\FlowDTO.class
com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class
com\junmp\junmpProcess\dto\json\GroupsInfo.class
com\junmp\junmpProcess\utils\IdWorker.class
com\junmp\junmpProcess\entity\TemplateGroup$TemplateGroupBuilder.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$11.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$12.class
com\junmp\junmpProcess\utils\DateUtils$4.class
com\junmp\junmpProcess\doc\BpmnDoc.class
com\junmp\junmpProcess\utils\SpringContextHolder.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$3.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$15.class
com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class
com\junmp\junmpProcess\utils\DateUtils$1.class
com\junmp\junmpProcess\entity\Departments.class
com\junmp\junmpProcess\utils\DateUtils$7.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$11.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class
com\junmp\junmpProcess\entity\ProcessTemplates$ProcessTemplatesBuilder.class
com\junmp\junmpProcess\service\Repository\impl\DepartmentsServiceImpl.class
com\junmp\junmpProcess\listener\TimerListener.class
com\junmp\junmpProcess\service\Repository\impl\WorkspaceProcessServiceImpl.class
com\junmp\junmpProcess\job\CustomJobCmd.class
com\junmp\junmpProcess\vo\CommentVO.class
com\junmp\junmpProcess\utils\DateUtils.class
com\junmp\junmpProcess\config\ActivitiConfig.class
com\junmp\junmpProcess\controller\OrgUserAndDeptController.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$5.class
com\junmp\junmpProcess\mapper\ProcessTemplatesMapper.class
com\junmp\junmpProcess\vo\AttachmentVO.class
com\junmp\junmpProcess\common\Result.class
com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$8.class
com\junmp\junmpProcess\dto\TaskDTO.class
com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$10.class
com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$2.class
com\junmp\junmpProcess\entity\ProcessTemplates.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$9.class
com\junmp\junmpProcess\dto\json\SettingsInfo.class
com\junmp\junmpProcess\utils\DateUtils$2.class
com\junmp\junmpProcess\service\Repository\impl\ProcessTemplateServiceImpl.class
com\junmp\junmpProcess\vo\HandleDataVO.class
com\junmp\junmpProcess\service\Repository\TemplateGroupService.class
com\junmp\junmpProcess\dto\StartProcessInstanceDTO.class
com\junmp\junmpProcess\service\Bussiness\impl\OrgUserAndDeptServiceImpl.class
com\junmp\junmpProcess\service\Repository\UserService.class
com\junmp\junmpProcess\listener\CounterSignListener$2.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$4.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$3.class
com\junmp\junmpProcess\dto\json\HttpInfo.class
com\junmp\junmpProcess\vo\HistoryProcessInstanceVO.class
com\junmp\junmpProcess\common\WorkFlowConstants.class
com\junmp\junmpProcess\service\Repository\ProcessTemplateService.class
com\junmp\junmpProcess\vo\TemplateGroupVo$Template.class
com\junmp\junmpProcess\job\CustomJobHandler.class
com\junmp\junmpProcess\dto\json\flowJson\FlowConditionGroup.class
com\junmp\junmpProcess\dto\json\Properties.class
com\junmp\junmpProcess\entity\Users$UsersBuilder.class
com\junmp\junmpProcess\enums\AssigneeTypeEnums.class
com\junmp\junmpProcess\dto\ApplyDTO.class
com\junmp\junmpProcess\enums\ModeEnums.class
com\junmp\junmpProcess\service\Repository\DepartmentsService.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$14.class
com\junmp\junmpProcess\utils\ExUtils.class
com\junmp\junmpProcess\vo\TemplateGroupVo$TemplateGroupVoBuilder.class
com\junmp\junmpProcess\listener\CounterSignListener$1.class
com\junmp\junmpProcess\service\Bussiness\WorkProcessService.class
com\junmp\junmpProcess\vo\TaskVO.class
com\junmp\junmpProcess\vo\ProcessInstanceDetailVO.class
com\junmp\junmpProcess\job\IdWorkerIdGenerator.class
pom.xml
...@@ -77,11 +77,16 @@ ...@@ -77,11 +77,16 @@
<p6spy.version>3.9.1</p6spy.version> <p6spy.version>3.9.1</p6spy.version>
<fastjson.version>1.2.83</fastjson.version> <fastjson.version>1.2.83</fastjson.version>
<lombok.version>1.18.20</lombok.version> <lombok.version>1.18.20</lombok.version>
<hutool.version>5.6.3</hutool.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency> <dependency>
<groupId>p6spy</groupId> <groupId>p6spy</groupId>
<artifactId>p6spy</artifactId> <artifactId>p6spy</artifactId>
...@@ -111,10 +116,11 @@ ...@@ -111,10 +116,11 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
<artifactId>v2-config-api</artifactId> <artifactId>v2-config-api</artifactId>
<version>1.0.0</version> <version>${junmp.v2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论