diff --git a/backend-adminend/.env.development b/backend-adminend/.env.development index 5ed07b2..4200a8e 100644 --- a/backend-adminend/.env.development +++ b/backend-adminend/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' - VUE_APP_BASE_API = 'http://127.0.0.1:30032' +# VUE_APP_BASE_API = 'http://127.0.0.1:30032' # VUE_APP_BASE_API = 'https://jfadmin.suzhouyuqi.com' # VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com' # VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' @@ -11,6 +11,9 @@ ENV = 'development' # byjyw149 项目（宝应金雅文商贸） # VUE_APP_BASE_API = 'https://jf.jinyawen.com' +# czleilei240 项目 +VUE_APP_BASE_API = 'https://leilei-jf.czchunfang.com' + # hapr191 项目（淮安鹏然商贸） # VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' # shccd159 项目 diff --git a/backend-adminend/.env.production b/backend-adminend/.env.production index 66d9fea..876a6b1 100644 --- a/backend-adminend/.env.production +++ b/backend-adminend/.env.production @@ -9,7 +9,8 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' # byjyw149 项目（宝应金雅文商贸） -VUE_APP_BASE_API = 'https://jf.jinyawen.com' +# czleilei240 项目 +VUE_APP_BASE_API = 'https://leilei-jf.czchunfang.com' # hapr191 项目（淮安鹏然商贸） # VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' diff --git a/backend/crmeb-admin/src/main/resources/application-czleilei240.yml b/backend/crmeb-admin/src/main/resources/application-czleilei240.yml new file mode 100644 index 0000000..15b9cfe --- /dev/null +++ b/backend/crmeb-admin/src/main/resources/application-czleilei240.yml @@ -0,0 +1,60 @@ +# CRMEB 相关配置 +crmeb: + captchaOn: false # 是否开启行为验证码 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30032 + +# 订单同步配置（每个单商户实例需要配置不同的source-id和target-mer-id） +sync: + source-id: shop_15 + target-mer-id: 15 + +spring: + datasource: + name: yangtangyoupin + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 116.62.83.240 #地址 + port: 6379 #端口 + password: 'UthinkCloud2017' + timeout: 10000 # 连接超时时间（毫秒） + database: 25 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数（使用负值表示没有限制） + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 25 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./crmeb_log + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-admin/src/main/resources/application.yml b/backend/crmeb-admin/src/main/resources/application.yml index e7404c5..8219ac3 100644 --- a/backend/crmeb-admin/src/main/resources/application.yml +++ b/backend/crmeb-admin/src/main/resources/application.yml @@ -38,7 +38,7 @@ server: spring: profiles: - active: byjyw149 + active: czleilei240 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java index e80e2f5..ac21492 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java @@ -73,7 +73,7 @@ public class WaUserController { FileInputStream fileInputStream = null; try { // 读取模板PDF文件 - Resource resource = new ClassPathResource("pdf/sign_contract_byjyw149.pdf"); + Resource resource = new ClassPathResource("pdf/sign_contract_czleilei240.pdf"); InputStream pdfInputStream = resource.getInputStream(); document = PDDocument.load(pdfInputStream); pdfInputStream.close(); @@ -199,7 +199,7 @@ public class WaUserController { // user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl()); // user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl()); // user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl()); - user.setContract("https://jinyawen.com/"+pdfResultVo.getUrl()); + user.setContract("https://leilei.czchunfang.com/"+pdfResultVo.getUrl()); waUsersDao.updateById(user); } return CommonResult.success(pdfResultVo); diff --git a/backend/crmeb-front/src/main/resources/application-czleilei240.yml b/backend/crmeb-front/src/main/resources/application-czleilei240.yml new file mode 100644 index 0000000..6715398 --- /dev/null +++ b/backend/crmeb-front/src/main/resources/application-czleilei240.yml @@ -0,0 +1,54 @@ +crmeb: + imagePath: /www/wwwroot/leilei.czchunfang.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://rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 116.62.83.240 #地址 + port: 6379 #端口 + password: 'UthinkCloud2017' + timeout: 10000 # 连接超时时间（毫秒） + database: 25 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数（使用负值表示没有限制） + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 25 # 微信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的密码 diff --git a/backend/crmeb-front/src/main/resources/application.yml b/backend/crmeb-front/src/main/resources/application.yml index d91342e..43a5493 100644 --- a/backend/crmeb-front/src/main/resources/application.yml +++ b/backend/crmeb-front/src/main/resources/application.yml @@ -32,7 +32,7 @@ server: spring: profiles: - active: byjyw149 + active: czleilei240 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/resources/pdf/sign_contract_czleilei240.pdf b/backend/crmeb-front/src/main/resources/pdf/sign_contract_czleilei240.pdf new file mode 100644 index 0000000..766d598 Binary files /dev/null and b/backend/crmeb-front/src/main/resources/pdf/sign_contract_czleilei240.pdf differ diff --git a/docs/com-czleilei240-data-imgration.md b/docs/com-czleilei240-data-imgration.md new file mode 100644 index 0000000..b4d9d65 --- /dev/null +++ b/docs/com-czleilei240-data-imgration.md @@ -0,0 +1,51 @@ +# 公司名称：池州雷蕾商贸 + +## mysql数据库配置信息 + +host ip: 116.62.83.240 +datasource: + rds: rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com + name: yangtangyoupin + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + +## 数据清理任务 + +- **数据范围**：用户 id 集（`wa_users`） + `93119,93134,93156,93173,93187,93188,93198,93190,93214,93220,93212,93221,93226,93235,93245,93240,93132,93183,93172,93197,93195,93193,93209,93215,93224,93239,93230,93133,93163,93191,93199` + +- 保留wa_users表中id在用户id数据范围的 ，删除其余用户数据 +- 保留eb_user表中uid在用户id数据范围的 ，删除其余用户数据 + +- wa_order +清空wa_order表中数据 + +- wa_merchandise +从源数据dump文件中提取“created_at >= 2026-05-14”并且seller_id或buyer_id在用户id数据范围的寄售商品，删除其余数据 +（当前库表字段为 `user_id` 表示卖家，实现时按 `user_id` 与日期条件过滤。） + +- wa_selfbonus_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_sharebonus_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_coupon_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_withdraw +清空wa_withdraw表中数据 + +- eb_store_order +清空eb_store_order表中数据 + +- eb_user_integral_record +只保留用户在名单内的记录；表字段为 `uid`（与 `wa_users.id` / `eb_user.uid` 对应），实现按 `uid` 过滤。 + +## 执行脚本 + + +## 相关文件 + +- 新公司初始会员信息： 'db/czleilei240/会员信息20260516.xlsx' + diff --git a/docs/com-czleilei240.md b/docs/com-czleilei240.md new file mode 100644 index 0000000..46bf012 --- /dev/null +++ b/docs/com-czleilei240.md @@ -0,0 +1,50 @@ +## 公司名称： 池州雷蕾商贸, host ip: 116.62.83.240 + +--- + +### backend/crmeb-front模块变更 + +- 1. profile: czleilei240 +- 2. profile file: application-czleilei240.yml, mysql和redis主机ip修改 +- 3. **PDF合同模板文件路径**：pdf/sign_contract_czleilei240.pdf +- 4. 用户PDF合同url地址前缀/落库域名：https://leilei.czchunfang.com/ +- 5. imagePath: /www/wwwroot/leilei.czchunfang.com/ + +### uniapp前端配置变更 + +- 1. 积分商城domain：https://leilei-jf.czchunfang.com +- 2. 抢购页面跳转地址：https://leilei.czchunfang.com +- 3. **PDF合同预览文件路径**： /static/sign_contract_czleilei240.pdf + + +--- + +### backend/crmeb-admin模块变更 + +- 1. profile: czleilei240 +- 2. profile file: application-czleilei240.yml, mysql和redis主机ip修改，sync: source-id: shop_15， target-mer-id: 15 + +### 积分商城后台backend-adminend配置变更 + +- 1. backend-adminend/.env.development文件中VUE_APP_BASE_API改为https://leilei-jf.czchunfang.com +- 2. backend-adminend/.env.production文件中VUE_APP_BASE_API改为https://leilei-jf.czchunfang.com + +--- + + +### **修改任务** + +- **已完成**新建分支czleilei240，合并sxsy80分支的最新代码到该分支，并根据上述信息修改相关需要变更项，使符合该新公司项目环境 + + +## 相关文件 + +、、、启动积分商城api服务 +cd /www/wwwroot/javaapi +nohup java -Xms128m -Xmx256m -jar miao-front-2.2.jar > front.log & tail -f front.log +、、、 + +、、、启动积分商城后台api服务 +cd /www/wwwroot/javaapi +nohup java -Xms128m -Xmx256m -jar miao-admin-2.2.jar > admin.log & tail -f admin.log +、、、 \ No newline at end of file diff --git a/single_uniapp22miao/config/app.js b/single_uniapp22miao/config/app.js index ca2561e..7c6839c 100644 --- a/single_uniapp22miao/config/app.js +++ b/single_uniapp22miao/config/app.js @@ -6,7 +6,9 @@ // let domain = 'https://jfanyue.szxingming.com' // let domain = 'https://jf.wenjinhui.com' // let domain = 'https://jjy-jf.fwxgpt.com' -let domain = 'https://jf.jinyawen.com' +// czleilei240 项目 +let domain = 'https://leilei-jf.czchunfang.com' +// let domain = 'https://jf.jinyawen.com' // let domain = 'https://jf.hapengran.com' // let domain = 'https://jjy-jf.uj345.com' // let domain = 'https://ccd-jf.cichude.com' @@ -17,7 +19,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'https://jf.jinyawen.com', + HTTP_H5_URL: 'https://leilei-jf.czchunfang.com', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/single_uniapp22miao/pages/index/index.vue b/single_uniapp22miao/pages/index/index.vue index fac075b..7a94c75 100644 --- a/single_uniapp22miao/pages/index/index.vue +++ b/single_uniapp22miao/pages/index/index.vue @@ -34,7 +34,7 @@ export default { data() { return { - pdfUrl: '/static/sign_contract_byjyw149.pdf', + pdfUrl: '/static/sign_contract_czleilei240.pdf', userId: '', isMobile: false, usePdfJs: false, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue index 57bf8b1..79d47d5 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue @@ -16,7 +16,7 @@ export default { }, onLoad(options) { - const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_byjyw149.pdf' + const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_czleilei240.pdf' this.pdfUrl = url }, diff --git a/single_uniapp22miao/static/sign_contract_czleilei240.pdf b/single_uniapp22miao/static/sign_contract_czleilei240.pdf new file mode 100644 index 0000000..766d598 Binary files /dev/null and b/single_uniapp22miao/static/sign_contract_czleilei240.pdf differ