Skip to content

T
TrainSys
提交 82670f1f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

chitanda 发布系统代码 [TrainSys，网页端]

上级 47d3d50c
显示空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 211 行删除
pom.xml
浏览文件 @ 82670f1f
...@@ -25,10 +25,11 @@ ...@@ -25,10 +25,11 @@
</modules> </modules>
<properties> <properties>
<ibiz.cloud.version>8.1.0.243</ibiz.cloud.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>false</maven.deploy.skip>
<ibiz.cloud.version>8.1.0.252</ibiz.cloud.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
<version>${ibiz.cloud.version}</version> <version>${ibiz.cloud.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
......
trainsys-core/pom.xml
浏览文件 @ 82670f1f
...@@ -14,93 +14,15 @@ ...@@ -14,93 +14,15 @@
<description>Trainsys Core</description> <description>Trainsys Core</description>
<dependencies> <dependencies>
<!-- Liquibase -->
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>3.9.0</version>
</dependency>
<!-- H2 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.200</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format> <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
</properties> </properties>
<profiles> <profiles>
<profile>
<id>diff</id>
<build>
<plugins>
<plugin>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
<version>${liquibase.version}</version>
<executions>
<execution>
<id>prepare-newdb</id>
<configuration>
<changeLogFile>${project.basedir}/src/main/resources/liquibase/h2_table.xml</changeLogFile>
<driver>org.h2.Driver</driver>
<url>jdbc:h2:file:${project.build.directory}/db/new;MODE=mysql</url>
<username>root</username>
<dropFirst>true</dropFirst>
</configuration>
<phase>process-resources</phase>
<goals>
<goal>update</goal>
</goals>
</execution>
<execution>
<id>prepare-olddb</id>
<configuration>
<changeLogFile>${project.basedir}/src/main/resources/liquibase/master_table.xml</changeLogFile>
<driver>org.h2.Driver</driver>
<url>jdbc:h2:file:${project.build.directory}/db/last;MODE=mysql</url>
<username>root</username>
<dropFirst>true</dropFirst>
</configuration>
<phase>process-resources</phase>
<goals>
<goal>update</goal>
</goals>
</execution>
<execution>
<id>make-diff</id>
<configuration>
<changeLogFile>${project.basedir}/src/main/resources/liquibase/changelog/empty.xml</changeLogFile>
<diffChangeLogFile>${project.basedir}/src/main/resources/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
<driver>org.h2.Driver</driver>
<url>jdbc:h2:file:${project.build.directory}/db/last;MODE=mysql</url>
<username>root</username>
<password></password>
<referenceUrl>jdbc:h2:file:${project.build.directory}/db/new;MODE=mysql</referenceUrl>
<referenceDriver>org.h2.Driver</referenceDriver>
<referenceUsername>root</referenceUsername>
<verbose>true</verbose>
<logging>debug</logging>
<contexts>!test</contexts>
<diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit,ibzcfg,IBZFILE,IBZUSER,IBZDATAAUDIT,IBZCFG</diffExcludeObjects>
</configuration>
<phase>process-resources</phase>
<goals>
<goal>diff</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>
trainsys-core/src/main/java/cn/ibizlab/trainsys/runtime/ISystemRuntime.java
浏览文件 @ 82670f1f
...@@ -4,7 +4,6 @@ import net.ibizsys.central.cloud.core.IServiceSystemRuntime; ...@@ -4,7 +4,6 @@ import net.ibizsys.central.cloud.core.IServiceSystemRuntime;
public interface ISystemRuntime extends IServiceSystemRuntime { public interface ISystemRuntime extends IServiceSystemRuntime {
}
}
trainsys-core/src/main/java/cn/ibizlab/trainsys/runtime/SystemRuntimeBase.java
浏览文件 @ 82670f1f
...@@ -23,9 +23,5 @@ public class SystemRuntimeBase extends ServiceSystemRuntime implements ISystemRu ...@@ -23,9 +23,5 @@ public class SystemRuntimeBase extends ServiceSystemRuntime implements ISystemRu
return psModelServiceImpl; return psModelServiceImpl;
} }
@Override
protected ISysUtilRuntime createDefaultSysUtilRuntime(IPSSysUtil iPSSysUtil) {
return super.createDefaultSysUtilRuntime(iPSSysUtil);
}
} }
trainsys-provider/pom.xml
浏览文件 @ 82670f1f
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
<version>1.0.0.0</version> <version>1.0.0.0</version>
</parent> </parent>
<groupId>cn.ibizlab.trainsys</groupId>
<artifactId>trainsys-provider</artifactId> <artifactId>trainsys-provider</artifactId>
<version>1.0.0.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -29,6 +27,7 @@ ...@@ -29,6 +27,7 @@
</dependencies> </dependencies>
<properties> <properties>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix> <docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties> </properties>
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
<version>0.4.13</version> <version>0.4.13</version>
<configuration> <configuration>
<serverId>ibiz-dev</serverId> <serverId>ibiz-dev</serverId>
<imageName>dstimage</imageName> <imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory> <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources> <resources>
<resource> <resource>
...@@ -107,7 +106,7 @@ ...@@ -107,7 +106,7 @@
<argument>--platform</argument> <argument>--platform</argument>
<argument>linux/amd64,linux/arm64</argument> <argument>linux/amd64,linux/arm64</argument>
<argument>-t</argument> <argument>-t</argument>
<argument>dstimage</argument> <argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
<argument>${project.basedir}/src/main/docker</argument> <argument>${project.basedir}/src/main/docker</argument>
<argument>--push</argument> <argument>--push</argument>
</arguments> </arguments>
...@@ -115,35 +114,6 @@ ...@@ -115,35 +114,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>copy-model</id>
<phase>process-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<!-- 输出目录 -->
<outputDirectory>${project.build.outputDirectory}/model--23D878A4-E43A-41F7-8D72-6C24B47945F9--1</outputDirectory>
<resources>
<resource>
<!-- 资源目录 -->
<directory>${project.basedir}/../model</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 82670f1f
version: "3.2" version: "3.2"
services: services:
trainsys-provider: trainsys-provider:
image: dstimage image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "8081:8081" - "8081:8081"
networks: networks:
......
trainsys-provider/src/main/resources/application-sys.yml
浏览文件 @ 82670f1f
...@@ -2,22 +2,6 @@ ...@@ -2,22 +2,6 @@
spring: spring:
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
cache:
redis:
time-to-live: 72000
caffeine:
spec: initialCapacity=5,maximumSize=500,expireAfterWrite=72000s
redis:
host: 172.16.240.110
port: 6379
password:
database: 0
lettuce:
pool:
max-active: 32
max-wait: 300ms
max-idle: 16
min-idle: 8
servlet: servlet:
multipart: multipart:
max-file-size: 100MB max-file-size: 100MB
...@@ -30,25 +14,6 @@ spring: ...@@ -30,25 +14,6 @@ spring:
isSyncDBSchema: false isSyncDBSchema: false
defaultSchema: a_LAB01_d23cc850e defaultSchema: a_LAB01_d23cc850e
dynamic: dynamic:
druid: #以下是全局默认值，可以全局更改
filters: stat,wall,log4j2
#配置初始化大小/最小/最大
initial-size: 1
min-idle: 1
max-active: 20
#获取连接等待超时时间
max-wait: 60000
#间隔多久进行一次检测，检测需要关闭的空闲连接
time-between-eviction-runs-millis: 60000
#一个连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
#打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
datasource: datasource:
master: master:
username: ${spring.datasource.username} username: ${spring.datasource.username}
...@@ -58,7 +23,6 @@ spring: ...@@ -58,7 +23,6 @@ spring:
#启动是否加载liquibase构建表结构 #启动是否加载liquibase构建表结构
liquibase: liquibase:
enabled: false enabled: false
change-log: classpath:liquibase/master_table.xml
# Mybatis-plus配置 # Mybatis-plus配置
mybatis-plus: mybatis-plus:
...@@ -75,24 +39,6 @@ mybatis-plus: ...@@ -75,24 +39,6 @@ mybatis-plus:
map-underscore-to-camel-case: false map-underscore-to-camel-case: false
type-handlers-package: net.ibizsys.central.plugin.mybatisplus.spring.typehandler type-handlers-package: net.ibizsys.central.plugin.mybatisplus.spring.typehandler
# 阿里sentinel熔断器
feign:
httpclient:
enabled: true
sentinel:
enabled: true
compression:
request:
enabled: true
mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
min-response-size: 10240
response:
enabled: true
#zuul网关超时设置
ribbon:
ReadTimeout: 60000
ConnectTimeout: 60000
#Log配置 #Log配置
logging: logging:
...@@ -100,29 +46,7 @@ logging: ...@@ -100,29 +46,7 @@ logging:
net.ibizsys.central.database.mybatis: INFO net.ibizsys.central.database.mybatis: INFO
org.springframework.boot.autoconfigure: ERROR org.springframework.boot.autoconfigure: ERROR
#系统是否开启权限验证、是否开启缓存
#缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
ibiz:
db:
batchsize: 2000
auth:
excludesPattern: /v7/login,/uaa/login,/uaa/loginbyusername,/uaa/casproxylogin
enablePermissionValid: true
cacheLevel: L2 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
deploysystems:
- deploysystemobj: cn.ibizlab.trainsys.core.runtime.SystemRuntime
deploysystemid: TrainSys
# fromjar: false
# modelpath: model
fromjar: true
modelpath: model--23D878A4-E43A-41F7-8D72-6C24B47945F9--1
db: master
# jobs:
# admin-address: http://127.0.0.1:40005
# app-name: TrainSys
# app-port: 9999
# app-ip: 127.0.0.1
### 启用Gzip压缩 ### 启用Gzip压缩
server: server:
......
trainsys-provider/src/main/resources/application.yml
浏览文件 @ 82670f1f
...@@ -33,3 +33,4 @@ logging: ...@@ -33,3 +33,4 @@ logging:
net.ibizsys.central.cloud: debug net.ibizsys.central.cloud: debug
net.ibizsys.central: debug net.ibizsys.central: debug
net.ibizsys.runtime: debug net.ibizsys.runtime: debug
cn.ibizlab.trainsys: debug
\ No newline at end of file
trainsys-provider/src/main/resources/servicehub.yml
浏览文件 @ 82670f1f
...@@ -4,13 +4,6 @@ fontfolder: /usr/share/fonts ...@@ -4,13 +4,6 @@ fontfolder: /usr/share/fonts
deploysystems: deploysystems:
- gateway - gateway
- trainsys - trainsys
datasources:
trainsys__default:
username: a_LAB01_d23cc850e
password: 'f9Df4556'
url: jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
dbtype: MYSQL5
systemsettings: systemsettings:
cloudclientutil: cloudclientutil:
serviceurl: lb://ebsx-oldapi serviceurl: lb://ebsx-oldapi
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或