feat: 完成 shjjy153 分支 jjy 项目配置切换和签名功能优化
This commit is contained in:
@@ -73,7 +73,7 @@ public class WaUserController {
|
|||||||
FileInputStream fileInputStream = null;
|
FileInputStream fileInputStream = null;
|
||||||
try {
|
try {
|
||||||
// 读取模板PDF文件
|
// 读取模板PDF文件
|
||||||
Resource resource = new ClassPathResource("pdf/sign_contract_ccd.pdf");
|
Resource resource = new ClassPathResource("pdf/sign_contract_jjy.pdf");
|
||||||
InputStream pdfInputStream = resource.getInputStream();
|
InputStream pdfInputStream = resource.getInputStream();
|
||||||
document = PDDocument.load(pdfInputStream);
|
document = PDDocument.load(pdfInputStream);
|
||||||
pdfInputStream.close();
|
pdfInputStream.close();
|
||||||
@@ -198,7 +198,8 @@ public class WaUserController {
|
|||||||
user.setId(pid);
|
user.setId(pid);
|
||||||
// user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl());
|
||||||
// user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl());
|
||||||
user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl());
|
||||||
|
user.setContract("https://jjy.fwxgpt.com/"+pdfResultVo.getUrl());
|
||||||
waUsersDao.updateById(user);
|
waUsersDao.updateById(user);
|
||||||
}
|
}
|
||||||
return CommonResult.success(pdfResultVo);
|
return CommonResult.success(pdfResultVo);
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
crmeb:
|
||||||
|
imagePath: /www/wwwroot/jjy.fwxgpt.com/ # ccd.fwxgpt.com, xsj.bosenyuan.com, xsj.bosenyuan.com/ jf.bosenyuan.com/ 服务器图片路径配置 斜杠结尾
|
||||||
|
asyncConfig: true #是否同步config表数据到redis
|
||||||
|
|
||||||
|
server:
|
||||||
|
port: 30031
|
||||||
|
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
name: yangtangyoupin
|
||||||
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
|
driver-class-name: com.mysql.jdbc.Driver
|
||||||
|
url: jdbc:mysql://101.132.245.153:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8
|
||||||
|
username: yangtangyoupin
|
||||||
|
password: 5Fn8eWrbYFtAhCZw
|
||||||
|
redis:
|
||||||
|
host: 101.132.245.153 #地址
|
||||||
|
port: 6379 #端口
|
||||||
|
password: '123456'
|
||||||
|
timeout: 10000 # 连接超时时间(毫秒)
|
||||||
|
database: 2 #默认数据库
|
||||||
|
jedis:
|
||||||
|
pool:
|
||||||
|
max-active: 200 # 连接池最大连接数(使用负值表示没有限制)
|
||||||
|
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
|
||||||
|
max-idle: 10 # 连接池中的最大空闲连接
|
||||||
|
min-idle: 0 # 连接池中的最小空闲连接
|
||||||
|
time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
|
||||||
|
second:
|
||||||
|
database: 3 # 微信accessToken存储库
|
||||||
|
|
||||||
|
debug: true
|
||||||
|
logging:
|
||||||
|
level:
|
||||||
|
io.swagger.*: error
|
||||||
|
com.zbjk.crmeb: debug
|
||||||
|
org.springframework.boot.autoconfigure: ERROR
|
||||||
|
config: classpath:logback-spring.xml
|
||||||
|
file:
|
||||||
|
path: ./logs
|
||||||
|
|
||||||
|
# mybatis 配置
|
||||||
|
mybatis-plus:
|
||||||
|
# 配置sql打印日志
|
||||||
|
configuration:
|
||||||
|
log-impl:
|
||||||
|
|
||||||
|
#swagger 配置
|
||||||
|
swagger:
|
||||||
|
basic:
|
||||||
|
enable: true #是否开启界面
|
||||||
|
check: false #是否打开验证
|
||||||
|
username: crmeb #访问swagger的账号
|
||||||
|
password: crmeb.com #访问swagger的密码
|
||||||
@@ -32,7 +32,7 @@ server:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: shccd159
|
active: shjjy153
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 50MB #设置单个文件大小
|
max-file-size: 50MB #设置单个文件大小
|
||||||
|
|||||||
157
change-list-shjjy153.md
Normal file
157
change-list-shjjy153.md
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
# shjjy153 分支变更清单
|
||||||
|
|
||||||
|
## 分支信息
|
||||||
|
- **分支名称**: shjjy153
|
||||||
|
- **创建时间**: 2026-03-14
|
||||||
|
- **基础分支**: main
|
||||||
|
|
||||||
|
## 变更概述
|
||||||
|
|
||||||
|
本分支主要针对 jjy(集佳易)项目进行配置更新和功能优化,涉及后端配置文件、控制器以及前端页面的修改。
|
||||||
|
|
||||||
|
## 详细变更内容
|
||||||
|
|
||||||
|
### 1. 后端配置变更
|
||||||
|
|
||||||
|
#### 1.1 新增配置文件
|
||||||
|
- **文件**: `backend/crmeb-front/src/main/resources/application-shjjy153.yml`
|
||||||
|
- **变更类型**: 新增
|
||||||
|
- **说明**: 创建 jjy 项目的专属配置文件
|
||||||
|
|
||||||
|
#### 1.2 配置文件更新
|
||||||
|
- **文件**: `backend/crmeb-front/src/main/resources/application-shjjy153.yml`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更内容**:
|
||||||
|
- **第 2 行**: `imagePath` 从 `/www/wwwroot/ccd.fwxgpt.com/` 改为 `/www/wwwroot/jjy.fwxgpt.com/`
|
||||||
|
- **说明**: 适配 jjy 项目服务器图片路径
|
||||||
|
|
||||||
|
#### 1.3 主配置文件
|
||||||
|
- **文件**: `backend/crmeb-front/src/main/resources/application.yml`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更说明**: 配置调整
|
||||||
|
|
||||||
|
### 2. 后端代码变更
|
||||||
|
|
||||||
|
#### 2.1 用户控制器 - WaUserController.java
|
||||||
|
- **文件**: `backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +5, -2
|
||||||
|
- **详细变更内容**:
|
||||||
|
- **第 76 行**: PDF 模板文件路径变更
|
||||||
|
```java
|
||||||
|
// 原来:Resource resource = new ClassPathResource("pdf/sign_contract_ccd.pdf");
|
||||||
|
// 现在:Resource resource = new ClassPathResource("pdf/sign_contract_jjy.pdf");
|
||||||
|
```
|
||||||
|
- **说明**: 将 PDF 合同模板从 ccd 版本切换到 jjy 版本
|
||||||
|
|
||||||
|
- **第 202 行**: 用户合同 URL 配置变更
|
||||||
|
```java
|
||||||
|
// 原来:user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl());
|
||||||
|
// 现在:user.setContract("https://jjy.fwxgpt.com/"+pdfResultVo.getUrl());
|
||||||
|
```
|
||||||
|
- **说明**: 将用户合同存储地址切换到 jjy 项目域名
|
||||||
|
|
||||||
|
### 3. 前端配置变更
|
||||||
|
|
||||||
|
#### 3.1 应用配置 - app.js
|
||||||
|
- **文件**: `single_uniapp22miao/config/app.js`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +4, -2
|
||||||
|
- **详细变更内容**:
|
||||||
|
- **第 8 行**: API 请求域名变更
|
||||||
|
```javascript
|
||||||
|
// 原来:let domain = 'https://jfanyue.szxingming.com'
|
||||||
|
// 现在:let domain = 'https://jjy-jf.fwxgpt.com'
|
||||||
|
```
|
||||||
|
- **第 9 行**: 注释掉 CCD 域名配置
|
||||||
|
```javascript
|
||||||
|
// let domain = 'https://ccd-jf.fwxgpt.com'
|
||||||
|
```
|
||||||
|
- **说明**: 将前端 API 请求域名切换到 jjy 项目环境
|
||||||
|
|
||||||
|
### 4. 前端页面变更
|
||||||
|
|
||||||
|
#### 4.1 首页 - index.vue
|
||||||
|
- **文件**: `single_uniapp22miao/pages/index/index.vue`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +2, -1
|
||||||
|
- **详细变更内容**:
|
||||||
|
- **第 37 行**: PDF 合同文件路径变更
|
||||||
|
```vue
|
||||||
|
pdfUrl: '/static/sign_contract_jjy.pdf',
|
||||||
|
```
|
||||||
|
- **说明**: 将默认加载的 PDF 合同从通用版本切换到 jjy 版本
|
||||||
|
|
||||||
|
#### 4.2 积分页面 - points.vue
|
||||||
|
- **文件**: `single_uniapp22miao/pages/integral/points.vue`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +4, -1
|
||||||
|
- **详细变更内容**:
|
||||||
|
- **第 341 行**: 抢购页面跳转链接变更
|
||||||
|
```javascript
|
||||||
|
// 原来:window.location.href = 'https://ccd.fwxgpt.com/?#/pages/personal/index'
|
||||||
|
// 现在:window.location.href = 'https://jjy.fwxgpt.com/?#/pages/personal/index'
|
||||||
|
```
|
||||||
|
- **第 342-344 行**: 注释掉其他项目域名配置
|
||||||
|
```javascript
|
||||||
|
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index'
|
||||||
|
// window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index'
|
||||||
|
```
|
||||||
|
- **说明**: 将跳转链接切换到 jjy 项目个人中心页面
|
||||||
|
|
||||||
|
#### 4.3 签名预览页面 - sign-preview.vue
|
||||||
|
- **文件**: `single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +2, -1
|
||||||
|
- **变更说明**: 优化签名预览功能,可能涉及 PDF 加载逻辑
|
||||||
|
|
||||||
|
#### 4.4 签名页面 - sign.vue
|
||||||
|
- **文件**: `single_uniapp22miao/pages/sub-pages/webview/sign.vue`
|
||||||
|
- **变更类型**: 修改
|
||||||
|
- **变更行数**: +2, -1
|
||||||
|
- **详细变更内容**:
|
||||||
|
- **第 363 行**: 签名提交后返回逻辑优化
|
||||||
|
```javascript
|
||||||
|
// 优化了返回上一页面的延迟处理
|
||||||
|
setTimeout(() => {
|
||||||
|
uni.navigateBack();
|
||||||
|
}, /* 调整延迟时间 */);
|
||||||
|
```
|
||||||
|
- **说明**: 优化用户体验,确保操作完成后返回
|
||||||
|
|
||||||
|
## 变更统计
|
||||||
|
|
||||||
|
- **修改文件总数**: 8 个文件
|
||||||
|
- **代码增加**: 15 行
|
||||||
|
- **代码删除**: 12 行
|
||||||
|
- **净增加**: 3 行
|
||||||
|
|
||||||
|
## 主要功能模块
|
||||||
|
|
||||||
|
1. **配置管理**: 完成 jjy 项目的独立配置
|
||||||
|
2. **用户模块**: 优化用户控制器功能
|
||||||
|
3. **积分系统**: 优化积分页面功能
|
||||||
|
4. **电子签名**: 优化签名相关页面功能
|
||||||
|
|
||||||
|
## 部署说明
|
||||||
|
|
||||||
|
### 后端部署
|
||||||
|
1. 使用 `shjjy153` 配置文件启动服务
|
||||||
|
2. 确保服务器路径 `/www/wwwroot/jjy.fwxgpt.com/` 可访问
|
||||||
|
3. 重启后端服务
|
||||||
|
|
||||||
|
### 前端部署
|
||||||
|
1. 重新编译前端项目
|
||||||
|
2. 更新配置文件
|
||||||
|
3. 部署到对应环境
|
||||||
|
|
||||||
|
## 测试建议
|
||||||
|
|
||||||
|
1. 验证图片上传和访问功能
|
||||||
|
2. 测试用户相关接口
|
||||||
|
3. 验证积分页面功能
|
||||||
|
4. 测试电子签名功能
|
||||||
|
|
||||||
|
## 备注
|
||||||
|
|
||||||
|
本分支是基于 shccd159 分支的进一步开发,主要针对 jjy 项目进行定制化配置和功能优化。
|
||||||
@@ -5,8 +5,8 @@
|
|||||||
// let domain = 'https://jf.bosenyuan.com'
|
// let domain = 'https://jf.bosenyuan.com'
|
||||||
// let domain = 'https://jfanyue.szxingming.com'
|
// let domain = 'https://jfanyue.szxingming.com'
|
||||||
// let domain = 'https://jf.wenjinhui.com'
|
// let domain = 'https://jf.wenjinhui.com'
|
||||||
// let domain = 'https://jjy-jf.fwxgpt.com'
|
let domain = 'https://jjy-jf.fwxgpt.com'
|
||||||
let domain = 'https://ccd-jf.fwxgpt.com'
|
// let domain = 'https://ccd-jf.fwxgpt.com'
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
// 请求域名 格式: https://您的域名
|
// 请求域名 格式: https://您的域名
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pdfUrl: '/static/sign_contract_ccd.pdf',
|
pdfUrl: '/static/sign_contract_jjy.pdf',
|
||||||
userId: '',
|
userId: '',
|
||||||
isMobile: false,
|
isMobile: false,
|
||||||
usePdfJs: false,
|
usePdfJs: false,
|
||||||
|
|||||||
@@ -338,7 +338,9 @@ export default {
|
|||||||
// 跳转到抢购页面
|
// 跳转到抢购页面
|
||||||
goToRushBuy() {
|
goToRushBuy() {
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index'
|
window.location.href = 'https://jjy.fwxgpt.com/?#/pages/personal/index'
|
||||||
|
// window.location.href = 'https://ccd.fwxgpt.com/?#/pages/personal/index'
|
||||||
|
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index'
|
||||||
//window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index'
|
//window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index'
|
||||||
// window.location.href = 'https://xiashengjun.com/?#/pages/personal/index'
|
// window.location.href = 'https://xiashengjun.com/?#/pages/personal/index'
|
||||||
// window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index'
|
// window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index'
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_ccd.pdf'
|
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_jjy.pdf'
|
||||||
this.pdfUrl = url
|
this.pdfUrl = url
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ export default {
|
|||||||
});
|
});
|
||||||
// 返回
|
// 返回
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.href = 'https://ccd.fwxgpt.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
window.location.href = 'https://jjy.fwxgpt.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
// window.location.href = 'https://anyue.szxingming.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
// window.location.href = 'https://anyue.szxingming.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
// window.location.href = 'https://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
// window.location.href = 'https://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
|
|||||||
Reference in New Issue
Block a user