Skip to content

9
91isoft_spbt_project
Commit 6a259825 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

修改配置

parent 83cc9cf7
Hide whitespace changes
Inline Side-by-side
Showing with 352 additions and 180 deletions
pom.xml
View file @ 6a259825
......@@ -12,8 +12,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring.boot.version>2.1.4.RELEASE</spring.boot.version>
<java.version>17</java.version>
<spring.boot.version>2.5.5</spring.boot.version>
</properties>
<dependencyManagement>
......@@ -33,7 +33,7 @@
<dependency>
<groupId>org.91isoft</groupId>
<artifactId>91isoft_spbt</artifactId>
<version>2.1.6_beta7</version>
<version>3.1.0_activiti_beta6</version>
</dependency>
</dependencies>
......@@ -65,40 +65,132 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<!-- 镜像名称 -->
<imageName>${project.artifactId}:v${project.version}</imageName>
<!-- Dockerfile 文件目录 -->
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<!-- docker远程服务地址 -->
<dockerHost>http://103.249.252.109:2375</dockerHost>
<resources>
<resource>
<targetPath>/</targetPath>
<!-- 资源所在目录 -->
<directory>${project.build.directory}</directory>
<!-- 生成的.jar文件 -->
<include>${project.build.finalName}.jar</include>
</resource>
<resource>
<targetPath>/</targetPath>
<!-- 资源所在目录 -->
<directory>${project.build.outputDirectory}</directory>
</resource>
</resources>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>com.spotify</groupId>-->
<!-- <artifactId>docker-maven-plugin</artifactId>-->
<!-- <configuration>-->
<!-- &lt;!&ndash; 镜像名称 &ndash;&gt;-->
<!-- <imageName>${project.artifactId}:v${project.version}</imageName>-->
<!-- &lt;!&ndash; Dockerfile 文件目录 &ndash;&gt;-->
<!-- <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>-->
<!-- &lt;!&ndash; docker远程服务地址 &ndash;&gt;-->
<!-- <dockerHost>http://103.249.252.109:2375</dockerHost>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <targetPath>/</targetPath>-->
<!-- &lt;!&ndash; 资源所在目录 &ndash;&gt;-->
<!-- <directory>${project.build.directory}</directory>-->
<!-- &lt;!&ndash; 生成的.jar文件 &ndash;&gt;-->
<!-- <include>${project.build.finalName}.jar</include>-->
<!-- </resource>-->
<!-- <resource>-->
<!-- <targetPath>/</targetPath>-->
<!-- &lt;!&ndash; 资源所在目录 &ndash;&gt;-->
<!-- <directory>${project.build.outputDirectory}</directory>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </plugin>-->
</plugins>
</build>
<repositories>
<repository>
<id>nexus-91isoft-release</id>
<name>local release nexus</name>
<url>http://nexus.91isoft.com:8081/nexus/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>nexus-91isoft-public</id>
<name>local private nexus</name>
<url>http://nexus.91isoft.com:8081/nexus/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>nexus-91isoft-third</id>
<name>third</name>
<url>http://nexus.91isoft.com:8081/nexus/repository/third/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!--aliyun-->
<repository>
<id>aliyun-repos</id>
<url>https://maven.aliyun.com/repository/public/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>nexus-91isoft</id>
<url>http://nexus.91isoft.com:8081/nexus/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>nexus-91isoft-public</id>
<url>http://nexus.91isoft.com:8081/nexus/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>nexus-releases</id>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>aliyun-plugin</id>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
\ No newline at end of file
</project>
src/main/java/org/rcisoft/business/bspace/dao/BSpaceRepository.java
View file @ 6a259825
package org.rcisoft.business.bspace.dao;
import org.rcisoft.core.base.CyBaseMapper;
import org.rcisoft.core.mapper.CyBaseMapper;
import org.rcisoft.business.bspace.entity.BSpace;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Select;
......
src/main/java/org/rcisoft/business/bspace/service/BSpaceService.java
View file @ 6a259825
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.rcisoft.business.bspace.entity.BSpace;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.aop.CyPageUtil;
import org.rcisoft.core.model.CyPageInfo;
import java.util.List;
......@@ -15,40 +14,40 @@ import java.util.List;
public interface BSpaceService {
/**
* 保存
* 保存
* @param bSpace
* @return
*/
CyPersistModel persist(BSpace bSpace);
/**
* 删除
* 删除
* @param bSpace
* @return
*/
CyPersistModel remove(BSpace bSpace);
/**
* 逻辑删除
* 逻辑删除
* @param bSpace
* @return
*/
CyPersistModel removeLogical(BSpace bSpace);
/**
* 修改
* 修改
* @param bSpace
* @return
*/
CyPersistModel merge(BSpace bSpace);
/**
* 根据id查询
* 根据id查询
* @param id
* @return
*/
BSpace findById(String id);
/**
* 分页查询
* 分页查询
* @param bSpace
* @return
*/
......@@ -57,7 +56,7 @@ public interface BSpaceService {
/**
* 查询list
* 查询list
* @param bSpace
* @return
*/
......
src/main/java/org/rcisoft/business/bspace/service/impl/BSpaceServiceImpl.java
View file @ 6a259825
package org.rcisoft.business.bspace.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.rcisoft.core.util.CyLogPstUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.rcisoft.core.util.CyUserUtil;
import org.rcisoft.core.aop.CyPageUtil;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.business.bspace.dao.BSpaceRepository;
import org.rcisoft.business.bspace.entity.BSpace;
import org.rcisoft.business.bspace.service.BSpaceService;
import org.rcisoft.core.service.CyBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
......@@ -34,7 +26,7 @@ public class BSpaceServiceImpl extends ServiceImpl<BSpaceRepository,BSpace> imp
/**
* 保存
* 保存
* @param bSpace
* @return
*/
......@@ -44,15 +36,15 @@ public class BSpaceServiceImpl extends ServiceImpl<BSpaceRepository,BSpace> imp
//增加操作
CyUserUtil.setCurrentPersistOperation(bSpace);
int line = baseMapper.insert(bSpace);
CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"新增了ID为"+
bSpace.getBusinessId()+"的信息","新增");
// CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"新增了ID为"+
//bSpace.getBusinessId()+"的信息","新增");
log.info(CyUserUtil.getAuthenUsername()+"新增了ID为"+
bSpace.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 删除
* 删除
* @param bSpace
* @return
*/
......@@ -60,14 +52,14 @@ bSpace.getBusinessId()+"的信息","新增");
@Override
public CyPersistModel remove(BSpace bSpace){
int line = baseMapper.realDelete(bSpace);
CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"删除了ID为"+
log.debug(CyUserUtil.getAuthenUsername()+"删除了ID为"+
bSpace.getBusinessId()+"的信息","删除");
log.info(CyUserUtil.getAuthenUsername()+"删除了ID为"+
bSpace.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 逻辑删除
* 逻辑删除
* @param bSpace
* @return
*/
......@@ -77,15 +69,15 @@ bSpace.getBusinessId()+"的信息","删除");
CyUserUtil.setCurrentMergeOperation(bSpace);
bSpace.setDeleted();
int line = baseMapper.deleteById(bSpace);
CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
bSpace.getBusinessId()+"的信息","逻辑删除");
// CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
//bSpace.getBusinessId()+"的信息","逻辑删除");
log.info(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
bSpace.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 修改
* 修改
* @param bSpace
* @return
*/
......@@ -94,13 +86,13 @@ bSpace.getBusinessId()+"的信息","逻辑删除");
public CyPersistModel merge(BSpace bSpace){
CyUserUtil.setCurrentMergeOperation(bSpace);
int line = baseMapper.updateById(bSpace);
CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"修改了ID为"+bSpace.getBusinessId()+"的信息","修改");
// CyLogPstUtil.dbInfo(CyUserUtil.getAuthenUsername()+"修改了ID为"+bSpace.getBusinessId()+"的信息","修改");
log.info(CyUserUtil.getAuthenUsername()+"修改了ID为"+ bSpace.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 根据id查询
* 根据id查询
* @param id
* @return
*/
......@@ -110,7 +102,7 @@ bSpace.getBusinessId()+"的信息","逻辑删除");
}
/**
* 分页查询
* 分页查询
* @param bSpace
* @return
*/
......@@ -121,7 +113,7 @@ bSpace.getBusinessId()+"的信息","逻辑删除");
}
/**
* 查询list
* 查询list
* @param bSpace
* @return
*/
......
src/main/resources/application-dev.yml
View file @ 6a259825
server:
port: 8085
tomcat:
max-threads: 300
servlet:
context-path: /
session:
timeout: PT480M
port: 8085
tomcat:
max-threads: 300
servlet:
context-path: /
session:
timeout: PT480M
mybatis-plus:
mapper-locations: "classpath*:mapper/**/**/*.xml"
......@@ -29,9 +29,9 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/cyTest?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
url: jdbc:mysql://${MYSQL_HOST:192.144.239.97}:${MYSQL_PORT:20076}/isoftp?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root
password: cy
password: root
main:
allow-bean-definition-overriding: true
springfox:
......@@ -51,6 +51,7 @@ jwt:
register: "/register"
cy:
systemName: "91isoft"
init:
permission:
- "44"
......@@ -59,28 +60,84 @@ cy:
- "53"
role_undelete: ["8492d7e67ca64809bb6ded8823659866"]
user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
password: 111111
captchaType: math
model:
permission: rbac
schema: spbt
multipleDs: false
debug: false
rabbitMq: false
quartz: false
redis: false
mongodb: false
dbChange: true
loginLog: true
redisCluster: false
entityParam: true
decryptParam: false
decryptSm4Param: false
decryptSm4Secret: 'FFFAAA333666DDDB'
fileUpload: common
swagger2Config: true
webService:
enable: true
ssl:
enable: false
opeLogDb:
enable: false
ignorePackage: org.rcisoft.web.sys
schema: standalone
addressEnabled: true
activiti:
enable: false
schemaUpdate: true
databaseType: mysql
# databaseType: mysql
code:
enable: true
author: cy
database: mysql
basePackage: org.rcisoft.business
dbType: mysql
database: rcisoft
basePackage: org.rcisoft.bus
rejectRepeatSubmit:
enable: false
token: ft
expired: 1800
xss:
excludes:
- "/static/*"
- "/swagger-resources/*"
- "/api-docs/*"
- "/webjars/*"
access-crl:
enable: false
debug: true
storageModel: fail
whiteKeyRedis: AccessCrlWhite
blackKeyRedis: AccessCrlBlack
whiteList:
- "192.168.2.51"
- "192.168.2.51"
blackList:
pay:
twoDiCode:
apiServer: http://xxx.com
ali:
enable: false
config: /working/resource/ali.properties
wx:
enable: false
config: /working/resource/wx.properties
acp:
enable: false
config: /working/resource/acp.properties
security:
enable: true
permission: false
defaultFilter: true
gateway: false
acAllowOrigin: '*'
acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
acAllowHeaders: '*'
permit-all:
permitUnStatic:
- "/static/**"
......@@ -91,16 +148,18 @@ cy:
- "/auth/**"
- "/code/**/**"
- "/excelUtil/**"
- "/cros/**"
#- "/cros/**"
- "/nlttest/add/**"
- "/**/**"
permitStatic: ["/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css"]
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
global:
path:
base_upload_location: /working/resource/eduServer/
base_upload_location: /working/file/
base_discovery: 'http://192.144.239.97:20073/file/'
code_generate_location: /code
video_location: /video
temp_location: /temp
......@@ -118,3 +177,7 @@ knife4j:
username: zhangsan
password: 123456
logging:
level:
root: info
com.alibaba.nacos: info
src/main/resources/application-prod.yml
View file @ 6a259825
server:
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
port: 8085
tomcat:
max-threads: 300
servlet:
context-path: /
session:
timeout: PT480M
# logging: #使用logback-spring 注释掉logging 否则影响
# level:
# root: INFO
# org.springframework.web: DEBUG
druid:
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
min-idle: 1
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:
mybatis-plus:
mapper-locations: "classpath*:mapper/**/**/*.xml"
mapper:
mappers:
- org.rcisoft.core.base.CyBaseMapper
not-empty: false
identity: MYSQL
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
global-config:
db-config:
logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
spring:
multipart:
......@@ -76,26 +26,19 @@ spring:
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
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://${MYSQL_HOST:192.144.239.97}:${MYSQL_PORT:20076}/isoftp?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root
password: root
main:
allow-bean-definition-overriding: true
springfox:
documentation:
swagger:
v2:
path: /api-docs
#jwtAuth:
# header: Authorization
# token_header: CyBear
# secret_key: base64EncodedSecretKey
jwt:
header: Authorization
secret: mySecret
......@@ -108,44 +51,115 @@ jwt:
register: "/register"
cy:
systemName: "91isoft"
init:
permission:
- "44"
- "51"
- "52"
- "53"
- "44"
- "51"
- "52"
- "53"
role_undelete: ["8492d7e67ca64809bb6ded8823659866"]
user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
password: 111111
captchaType: math
model:
multipleDs: false
permission: rbac
schema: spbt
debug: false
rabbitMq: false
quartz: false
redis: false
mongodb: false
dbChange: true
loginLog: true
redisCluster: false
entityParam: true
decryptParam: false
decryptSm4Param: false
decryptSm4Secret: 'FFFAAA333666DDDB'
fileUpload: common
swagger2Config: true
activiti: true
security:i
webService:
enable: true
ssl:
enable: false
opeLogDb:
enable: false
ignorePackage: org.rcisoft.web.sys
schema: standalone
addressEnabled: true
activiti:
enable: false
schemaUpdate: true
# databaseType: mysql
code:
enable: true
author: cy
dbType: mysql
database: rcisoft
basePackage: org.rcisoft.bus
rejectRepeatSubmit:
enable: false
token: ft
expired: 1800
xss:
excludes:
- "/static/*"
- "/swagger-resources/*"
- "/api-docs/*"
- "/webjars/*"
access-crl:
enable: false
debug: true
storageModel: fail
whiteKeyRedis: AccessCrlWhite
blackKeyRedis: AccessCrlBlack
whiteList:
- "192.168.2.51"
- "192.168.2.51"
blackList:
pay:
twoDiCode:
apiServer: http://xxx.com
ali:
enable: false
config: /working/resource/ali.properties
wx:
enable: false
config: /working/resource/wx.properties
acp:
enable: false
config: /working/resource/acp.properties
security:
enable: true
permission: false
defaultFilter: true
gateway: false
acAllowOrigin: '*'
acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
acAllowHeaders: '*'
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"
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v2/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
- "/code/**/**"
- "/excelUtil/**"
#- "/cros/**"
- "/nlttest/add/**"
- "/**/**"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
global:
path:
base_upload_location: /working/resource/eduServer/
base_upload_location: /working/file/
base_discovery: 'http://192.144.239.97:20073/file/'
code_generate_location: /code
video_location: /video
temp_location: /temp
......@@ -154,4 +168,16 @@ global:
code:
admin: ROLE_1001
decryptKey: cyKey
resetPassword: 123456
\ No newline at end of file
resetPassword: 123456
knife4j:
markdowns: classpath:markdown/*
basic:
enable: false
username: zhangsan
password: 123456
logging:
level:
root: info
com.alibaba.nacos: info
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment