feat(byjyw149): switch project config to jinyawen environment
Align backend profile, contract template/domain, and uniapp mall/jump/pdf paths for the byjyw149 tenant so deployment matches the new company environment and avoids cross-tenant URLs. Made-with: Cursor
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_chenzhaochun.pdf");
|
Resource resource = new ClassPathResource("pdf/sign_contract_byjyw149.pdf");
|
||||||
InputStream pdfInputStream = resource.getInputStream();
|
InputStream pdfInputStream = resource.getInputStream();
|
||||||
document = PDDocument.load(pdfInputStream);
|
document = PDDocument.load(pdfInputStream);
|
||||||
pdfInputStream.close();
|
pdfInputStream.close();
|
||||||
@@ -199,7 +199,7 @@ public class WaUserController {
|
|||||||
// 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.cichude.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl());
|
||||||
user.setContract("https://chenzhaochun.com/"+pdfResultVo.getUrl());
|
user.setContract("https://jinyawen.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/jinyawen.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://8.140.218.149:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8
|
||||||
|
username: yangtangyoupin
|
||||||
|
password: 5Fn8eWrbYFtAhCZw
|
||||||
|
redis:
|
||||||
|
host: 8.140.218.149 #地址
|
||||||
|
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: czc231
|
active: byjyw149
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 50MB #设置单个文件大小
|
max-file-size: 50MB #设置单个文件大小
|
||||||
|
|||||||
Binary file not shown.
32
company-info-byjyw149.md
Normal file
32
company-info-byjyw149.md
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
|
||||||
|
## 公司名称:宝应金雅文商贸, host ip: 8.140.218.149
|
||||||
|
|
||||||
|
### backend/crmeb-front模块变更
|
||||||
|
|
||||||
|
- 1. profile: byjyw149
|
||||||
|
- 2. profile file: application-byjyw149.yml, mysql和redis主机ip修改为8.140.218.149
|
||||||
|
- 3. **PDF合同模板文件路径**:pdf/sign_contract_byjyw149.pdf
|
||||||
|
- 4. 用户PDF合同url地址前缀/落库域名:https://jinyawen.com/
|
||||||
|
- 5. imagePath: /www/wwwroot/jinyawen.com/
|
||||||
|
|
||||||
|
### uniapp前端配置变更
|
||||||
|
|
||||||
|
- 1. 积分商城domain:https://jf.jinyawen.com
|
||||||
|
- 2. 抢购页面跳转地址:https://jinyawen.com
|
||||||
|
- 2. **PDF合同预览文件路径**: /static/sign_contract_byjyw149.pdf
|
||||||
|
|
||||||
|
|
||||||
|
### **修改任务**
|
||||||
|
|
||||||
|
- 新建分支byjyw149,合并czc231分支的最新代码到该分支,并根据上述信息修改相关需要变更项,使符合该新公司项目环境
|
||||||
|
|
||||||
|
|
||||||
|
## 相关文件
|
||||||
|
|
||||||
|
- change-list-shjjy153.md
|
||||||
|
- compare-shjjy153-shccd159.md
|
||||||
|
|
||||||
|
、、、启动积分商城api服务
|
||||||
|
cd /www/wwwroot/javaapi
|
||||||
|
nohup java -Xms128m -Xmx256m -jar miao-front-2.2.jar > front.log & tail -f front.log
|
||||||
|
、、、
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
// 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://jf.chenzhaochun.com'
|
let domain = 'https://jf.jinyawen.com'
|
||||||
// let domain = 'https://jf.hapengran.com'
|
// let domain = 'https://jf.hapengran.com'
|
||||||
// let domain = 'https://jjy-jf.uj345.com'
|
// let domain = 'https://jjy-jf.uj345.com'
|
||||||
// let domain = 'https://ccd-jf.cichude.com'
|
// let domain = 'https://ccd-jf.cichude.com'
|
||||||
@@ -17,7 +17,7 @@ module.exports = {
|
|||||||
// HTTP_REQUEST_URL:'',
|
// HTTP_REQUEST_URL:'',
|
||||||
HTTP_REQUEST_URL: domain,
|
HTTP_REQUEST_URL: domain,
|
||||||
// H5商城地址
|
// H5商城地址
|
||||||
HTTP_H5_URL: 'https://jf.chenzhaochun.com',
|
HTTP_H5_URL: 'https://jf.jinyawen.com',
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
HTTP_REQUEST_URL:domain,
|
HTTP_REQUEST_URL:domain,
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pdfUrl: '/static/sign_contract_chenzhaochun.pdf',
|
pdfUrl: '/static/sign_contract_byjyw149.pdf',
|
||||||
userId: '',
|
userId: '',
|
||||||
isMobile: false,
|
isMobile: false,
|
||||||
usePdfJs: false,
|
usePdfJs: false,
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ export default {
|
|||||||
// 跳转到抢购页面
|
// 跳转到抢购页面
|
||||||
goToRushBuy() {
|
goToRushBuy() {
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
window.location.href = 'https://chenzhaochun.com/?#/pages/personal/index'
|
window.location.href = 'https://jinyawen.com/?#/pages/personal/index'
|
||||||
// window.location.href = 'https://ccd.cichude.com/?#/pages/personal/index'
|
// window.location.href = 'https://ccd.cichude.com/?#/pages/personal/index'
|
||||||
// window.location.href = 'https://shop.wenjinhui.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'
|
||||||
@@ -347,7 +347,7 @@ export default {
|
|||||||
// #endif
|
// #endif
|
||||||
// #ifndef H5
|
// #ifndef H5
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/web-view/index?url=' + encodeURIComponent('https://chenzhaochun.com/?#/pages/personal/index')
|
url: '/pages/web-view/index?url=' + encodeURIComponent('https://jinyawen.com/?#/pages/personal/index')
|
||||||
})
|
})
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_chenzhaochun.pdf'
|
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_byjyw149.pdf'
|
||||||
this.pdfUrl = url
|
this.pdfUrl = url
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ export default {
|
|||||||
});
|
});
|
||||||
// 返回
|
// 返回
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.href = 'https://chenzhaochun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
window.location.href = 'https://jinyawen.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) : '')
|
||||||
|
|||||||
BIN
single_uniapp22miao/static/sign_contract_byjyw149.pdf
Normal file
BIN
single_uniapp22miao/static/sign_contract_byjyw149.pdf
Normal file
Binary file not shown.
Reference in New Issue
Block a user