Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
2f77606
提交Java基础架构
zero-awei Feb 4, 2023
69c7569
修改显示项目名称
zero-awei Feb 4, 2023
1b383b9
新增网关、认证、登录架构模块
zero-awei Feb 9, 2023
ed79e0e
Update pom.xml
zero-awei Feb 10, 2023
bdf6a11
测试
forlove-SDN Feb 10, 2023
f884ed2
领域模型前期准备
forlove-SDN Feb 11, 2023
c21b661
代码生成器生成
forlove-SDN Feb 11, 2023
c09f779
完成修改功能(有申请)的API接口交互
forlove-SDN Feb 11, 2023
f9d773b
Merge remote-tracking branch 'origin/j4-payment-KONG'
Feb 11, 2023
53bb7a8
创建分支提交
binghujuelie Feb 12, 2023
b525638
完成修改功能(无申请)的API接口交互
forlove-SDN Feb 12, 2023
7e89924
根据单据编号查询单据详细信息
huozhipeng Feb 12, 2023
1fe2ff2
- 添加付款单报表导出Api文件
binghujuelie Feb 12, 2023
a71c152
添加付款单报表导出api
binghujuelie Feb 12, 2023
a3b5812
修改pom文件
binghujuelie Feb 12, 2023
430902e
2.12 完成接口编写、部分DTO的属性编写 部分Query模型未完成。
Feb 12, 2023
8d848be
对部分类和接口进行重命名
huozhipeng Feb 13, 2023
4a35dd3
单据查询接口
hu-sj Feb 13, 2023
8ca6651
单据查询接口
hu-sj Feb 13, 2023
25ccb55
完成修改采购预付单功能的API接口交互
forlove-SDN Feb 13, 2023
40b78db
完成 PaymentReqEntry 的领域模型的初步构建和相关接口定义
ProgrammerAndFarmer Feb 13, 2023
8c2a6c0
规范接口名
forlove-SDN Feb 13, 2023
c16ebab
2.13 接口全部移到PaymentApis。还有一些字典接口没补充。
Feb 13, 2023
bd478f5
Merge branch 'master' into j4
astro-zhou Feb 13, 2023
5bc0eb2
Update FinPayment.java
astro-zhou Feb 13, 2023
1a0fdfa
添加操作开启条件
astro-zhou Feb 13, 2023
c5ea155
删除了自定义apis,修改到了模块apis下
huozhipeng Feb 14, 2023
d31f86f
修改接口
forlove-SDN Feb 14, 2023
cda3696
修改接口
forlove-SDN Feb 14, 2023
77a6862
Merge branch 'j4-DocQueryList-husj' into j4
forlove-SDN Feb 14, 2023
0edd616
整合v0.1
forlove-SDN Feb 14, 2023
87129f8
Merge branch 'j4-details-hzp' into j4
forlove-SDN Feb 14, 2023
624499b
整合v0.2
forlove-SDN Feb 14, 2023
8d46248
导出接口
forlove-SDN Feb 14, 2023
8068662
Merge branch 'j4-export-binghujuelie' into j4
forlove-SDN Feb 14, 2023
7b461fa
新增删除接口
Poskty Feb 14, 2023
27c86b1
整合四人接口
forlove-SDN Feb 14, 2023
67eefe1
Merge branch 'j4' of https://github.com/zero-awei/zero-one-psisys int…
forlove-SDN Feb 14, 2023
4d106d2
Revert "新增删除接口"
Poskty Feb 14, 2023
baff615
提交领域模型 apis接口 controller中方法
Poskty Feb 14, 2023
b062ea5
提交领域模型 apis接口 controller中方法
Poskty Feb 14, 2023
8895979
添加审核功能
forlove-SDN Feb 14, 2023
f6fed14
Merge branch 'j4-delete-chuyunfei' into j4
forlove-SDN Feb 14, 2023
c4213b5
整合五人
forlove-SDN Feb 14, 2023
c5c4756
完成Excel表格导入相关接口定义
ProgrammerAndFarmer Feb 15, 2023
efcd422
合并 ExcelApis 到 PaymentApis 中,将在其他控制层实现的方法都转移到 PaymentController 当中
ProgrammerAndFarmer Feb 15, 2023
6908d93
2.15 补充三个字典接口,以及自动生成三张表的mapper。(sys_user,sys_depart,bas_bank_account)
Feb 15, 2023
1b083fb
Merge branch 'j4-payment-KONG' into j4
forlove-SDN Feb 15, 2023
8a3399c
整合六人
forlove-SDN Feb 15, 2023
e2329ab
Merge branch 'j4-paymentReqEntry-neigui' into j4
forlove-SDN Feb 15, 2023
7e4cdc8
整合v1.0
forlove-SDN Feb 15, 2023
f99e68e
整合v2
forlove-SDN Feb 15, 2023
e8d65b2
整合v2
forlove-SDN Feb 15, 2023
c9319e2
改名:将Payment更名为PrePayment
forlove-SDN Feb 16, 2023
f3e136c
开始开发
forlove-SDN Feb 16, 2023
37fc3b4
开发修改功能,进度50%
forlove-SDN Feb 17, 2023
a6a868d
Merge branch 'master' into J4
Feb 17, 2023
4c26b85
开发前整理 1.0
Feb 17, 2023
b33b15c
开发前整理 2.0
Feb 17, 2023
6051a1a
开发修改功能,进度70%
forlove-SDN Feb 17, 2023
a21942b
修改和审核功能,进度80%。存在问题:修改人如何获取
forlove-SDN Feb 18, 2023
00e5621
完成删除功能 问题:不知道单据阶段在数据库中如何判断
Poskty Feb 18, 2023
133ec1c
2.18 基本功能实现,鲁棒性待完善。缺少附件上传接口,隔日补充。
Feb 18, 2023
f9b1cc4
主要是实验有申请查询订单详情,总体完成度30%
huozhipeng Feb 18, 2023
1fd2fe2
已完成两个功能
huozhipeng Feb 20, 2023
382393e
2.20 补充了 获取已申请采购单接口;差附件上传
Feb 20, 2023
0402434
修改和审核功能,进度85%。待开发事项:1、用户信息的获取。2、审核方法重新实现。
forlove-SDN Feb 20, 2023
8bc1f38
修改了代码业务逻辑,更正了查询顺序和映射关系
huozhipeng Feb 21, 2023
5af9308
完成修改和审核功能,进度95%。待导入接口。
forlove-SDN Feb 21, 2023
b818028
新增领域模型 FinPaymentReqQuery 用于付款申请的分页查询
ProgrammerAndFarmer Feb 21, 2023
9b0bbb1
2.21 差附件上传
Feb 21, 2023
f02a4e8
完成修改和审核功能,进度95%。待导入接口。
forlove-SDN Feb 22, 2023
6e73dbf
修改组员代码,id生成,结构改变
forlove-SDN Feb 22, 2023
cf6e951
Merge branch 'j4-prepayment-KONG' into j4-modify-forever
forlove-SDN Feb 22, 2023
17c0b03
整合两人
forlove-SDN Feb 22, 2023
5de66ca
修改一下业务逻辑,对应多明细情况进行list列表构建
huozhipeng Feb 22, 2023
c6fe512
完成 FinPayment 导入模块的开发,现在可以导入 excel 文件,自动生成 FinPayment 实体
ProgrammerAndFarmer Feb 23, 2023
6725aed
整合两人
forlove-SDN Feb 23, 2023
e0ea34b
Merge branch 'j4-hzp' into j4-modify-forever
forlove-SDN Feb 23, 2023
b08bc8d
整合三人
forlove-SDN Feb 23, 2023
f889ce0
整合四人
forlove-SDN Feb 23, 2023
81b4e76
领域模型修改
forlove-SDN Feb 23, 2023
4728dd9
Merge branch 'j4-delete-chuyunfei' into j4-modify-forever
forlove-SDN Feb 23, 2023
f2807dd
整合五人
forlove-SDN Feb 23, 2023
918f60c
整合五人
forlove-SDN Feb 24, 2023
9d85baa
整合六人
forlove-SDN Feb 24, 2023
3f8e3dc
使用MP自动填充时间
forlove-SDN Feb 27, 2023
55575f0
xiugai
forlove-SDN Mar 1, 2023
a6f2cd3
Merge branch 'j4-dev-neigui' into j4-modify-forever
forlove-SDN Mar 1, 2023
cf2eed1
整合导入,差导出
forlove-SDN Mar 1, 2023
656ec9c
修改
forlove-SDN Mar 1, 2023
2afd015
缺少导入导出接口
forlove-SDN Mar 2, 2023
9765876
部署项目
forlove-SDN Mar 2, 2023
72845f0
去掉无用导入
forlove-SDN Mar 3, 2023
012166d
修改脚本
forlove-SDN Mar 3, 2023
95b7f3a
建立j4分支版本的代码准备更新j4-export-binghujuelie子分支
binghujuelie Mar 4, 2023
83474c1
将采购预付管理报表导出文件和报表导出链接整合到项目中,具体实现部分整合到FinPaymentServiceImpl中
binghujuelie Mar 4, 2023
36aa63d
修改对采购预付单的数据查询,优化代码
binghujuelie Mar 4, 2023
960ad25
Merge branch 'j4-export-binghujuelie' into j4
forlove-SDN Mar 4, 2023
8cefc8a
整合完毕
forlove-SDN Mar 4, 2023
a999f8b
整合完毕
forlove-SDN Mar 4, 2023
0d66693
整合完毕
forlove-SDN Mar 4, 2023
e528dff
整合完毕
forlove-SDN Mar 4, 2023
00e9105
整合完毕
forlove-SDN Mar 4, 2023
3e4b274
整合完毕
forlove-SDN Mar 5, 2023
f2846b1
整合完毕
forlove-SDN Mar 5, 2023
005a8bf
bug调试
forlove-SDN Mar 6, 2023
6ba5a7e
等待nacos中
forlove-SDN Mar 6, 2023
578db56
debug
forlove-SDN Mar 7, 2023
1531817
debug
forlove-SDN Mar 7, 2023
7e824d1
debug
forlove-SDN Mar 7, 2023
83e02ec
debug
forlove-SDN Mar 7, 2023
6c0c931
debug
forlove-SDN Mar 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
> >
> > `documents` -- 环境搭建、编码规范、项目需求等等文档资源
> >
> > `sc-java` -- `Java`项目主体
> > `psi-java` -- `Java`项目主体
> >
> > `sc-cpp` -- `C++`项目主体
> > `psi-cpp` -- `C++`项目主体
> >
> > `sc-frontend` -- 前端项目主体
> > `psi-frontend` -- 前端项目主体

## 软件架构

Expand Down
123 changes: 123 additions & 0 deletions psi-java/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# 工程简介
项目架构父模块,用于管理第三方依赖和项目模块

创建spring boot项目的时候如果比较慢可以使用:http://start.aliyun.com/ 替代原来的 https://start.spring.io


# 延伸阅读

## `nacos`服务器配置参考

***注意:上传到 `Nacos` 配置中心的配置不要带中文注释,不然会出想编码问题。***

### `system.yaml`

系统配置,后续配置网关或新增服务器都在这里配置,方便在线扩展

```yaml
spring:
cloud:
inetutils:
#优先网络IP选择
preferred-networks:
- 192.168
- 39.99
#忽略一些虚拟网卡
ignored-interfaces:
- docker0
- veth.*
- VM.*
- br-.*
```

### `data-source.yaml`

数据源配置

```yaml
#References
#https://github.com/alibaba/druid/tree/master/druid-spring-boot-starter
#https://github.com/alibaba/druid/wiki/DruidDataSource%E9%85%8D%E7%BD%AE
#https://github.com/alibaba/druid/wiki/DruidDataSource%E9%85%8D%E7%BD%AE%E5%B1%9E%E6%80%A7%E5%88%97%E8%A1%A8
spring:
#配置MySQL数据库
datasource:
url: jdbc:mysql://192.168.220.128:3306/test?useUnicode=true&useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
name: DruidDataSource
initial-size: 1
min-idle: 1
max-active: 20
async-init: true
max-wait: 6000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
max-evictable-idle-time-millis: 900000
validation-query: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
connection-init-sqls: SET NAMES utf8mb4 COLLATE utf8mb4_0900_ai_ci;
filters: stat
#配置Redis数据库
redis:
host: 192.168.220.128
port: 6379
password: 01star
data:
#mongodb配置
mongodb:
#格式: mongodb://账号:密码@主机地址:端口/数据库名称
uri: mongodb://awei:123456@192.168.220.128:27017/firstDb
```

### `third-services.yaml`

第三方服务配置

```yaml
#C++提供服务器
cpp:
sample:
url: http://localhost:8090
name: feign-cpp-sample
#sentinel提供服务
sentinel:
dashboard: 192.168.220.128:8718
#rocketmq配置
rocket-mq:
name-server: 192.168.220.128:9876
#seata配置
seata:
default: 192.168.220.128:8091
#logstash配置
logstash:
host: 192.168.220.128
#FASTDFS配置
#References
#https://i4t.com/4758.html
#https://github.com/happyfish100/fastdfs/tree/master/docker/dockerfile_network/conf
fastdfs:
charset: UTF-8
connect-timeout: 5
network-timeout: 30
http-secret-key: FastDFS1234567890
http-anti-steal-token: true
connection-pool-max-idle: 20
connection-pool-max-total: 20
connection-pool-min-idle: 2
nginx-servers: 192.168.220.128:8888
tracker-servers: 192.168.220.128:22122
#Easy ES
easy-es:
address: 192.168.220.128:9200
username: elastic #es用户名,若无则删去此行配置
password: WG7WVmuNMtM4GwNYkyWH #es密码,若无则删去此行配置
```

6 changes: 6 additions & 0 deletions psi-java/code-generator/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 工程简介
代码生成器项目,使用生成功能的时候请注意修改配置文件来对应目录结构

# 扩展阅读

https://baomidou.com/pages/779a6e/#%E5%BF%AB%E9%80%9F%E5%85%A5%E9%97%A8
34 changes: 34 additions & 0 deletions psi-java/code-generator/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>psi-java</artifactId>
<groupId>com.zeroone.star</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>code-generator</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
</dependency>
</dependencies>
</project>
60 changes: 60 additions & 0 deletions psi-java/code-generator/src/main/java/com/zeroone/star/App.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package com.zeroone.star;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.fill.Column;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.ResourceBundle;

/**
* <p>
* 描述:代码生成程序入口
* </p>
* <p>版权:&copy;01星球</p>
* <p>地址:01星球总部</p>
*
* @author 阿伟学长
* @version 1.0.0
*/
public class App {
/**
* 处理 all 情况
*
* @param tables 表名字符串
* @return 处理结果
*/
private static List<String> getTables(String tables) {
return "all".equals(tables) ? Collections.emptyList() : Arrays.asList(tables.split(","));
}

public static void main(String[] args) {
ResourceBundle res = ResourceBundle.getBundle("database");
FastAutoGenerator.create(res.getString("db.url"), res.getString("db.username"), res.getString("db.password"))
// 全局配置
.globalConfig((scanner, builder) -> builder
.author(scanner.apply("请输入作者名称:"))
.fileOverride() //允许重新文件
.disableOpenDir() //禁止生成成功打开文件夹
.outputDir(res.getString("g.output.dir")) //设置输出路径
)
// 包配置
.packageConfig((scanner, builder) -> builder
.parent(res.getString("pkg.name"))
.moduleName(scanner.apply("输入模块名称:"))
.pathInfo(Collections.singletonMap(OutputFile.mapperXml, res.getString("g.output.dir") + "\\..\\resources\\" + res.getString("pkg.xml.dir")))
)
// 策略配置
.strategyConfig((scanner, builder) -> builder
.addInclude(getTables(scanner.apply("请输入表名,多个英文逗号分隔,所有输入all:")))
.controllerBuilder().enableRestStyle().enableHyphenStyle()
.mapperBuilder().enableMapperAnnotation()
.entityBuilder().enableLombok().addTableFills(new Column("create_time", FieldFill.INSERT))
.build()
)
.execute();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
db.url=jdbc:mysql://43.138.223.223:3306/zopsi_sys?useUnicode=true&useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
db.username=root
db.password=psitxms9527
g.output.dir=.\\psi-prepayment\\src\\main\\java
pkg.name=com.zeroone.star
pkg.xml.dir=mapper
Loading