diff --git a/backend-adminend/.env.development b/backend-adminend/.env.development index 7b5d974..caeda1c 100644 --- a/backend-adminend/.env.development +++ b/backend-adminend/.env.development @@ -8,8 +8,8 @@ ENV = 'development' # VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com' # VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' # VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com' -# shjjy153 项目 -VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com' +# hapr191 项目（淮安鹏然商贸） +VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' # shccd159 项目 # VUE_APP_BASE_API = 'http://ccd-jfadmin.cichude.com' diff --git a/backend-adminend/.env.production b/backend-adminend/.env.production index d72a02f..188e3a3 100644 --- a/backend-adminend/.env.production +++ b/backend-adminend/.env.production @@ -8,8 +8,8 @@ ENV = 'production' # miao33 项目 # VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' -# shjjy153 项目 -VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com' +# hapr191 项目（淮安鹏然商贸） +VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' # shccd159 项目 # VUE_APP_BASE_API = 'http://ccd-jfadmin.cichude.com' diff --git a/backend/crmeb-admin/src/main/resources/application-hapr191.yml b/backend/crmeb-admin/src/main/resources/application-hapr191.yml new file mode 100644 index 0000000..c3e9eaa --- /dev/null +++ b/backend/crmeb-admin/src/main/resources/application-hapr191.yml @@ -0,0 +1,59 @@ +# CRMEB 相关配置 +crmeb: + captchaOn: false # 是否开启行为验证码 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30032 + +sync: + source-id: shop_e + target-mer-id: 7 + +spring: + datasource: + name: yangtangyoupin + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://114.55.232.191:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 114.55.232.191 #地址 + 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: 2 # 微信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-admin/src/main/resources/application.yml b/backend/crmeb-admin/src/main/resources/application.yml index 11e96cd..14184ba 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: shccd159 + active: hapr191 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 bc1083c..48869c9 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_jjy.pdf"); + Resource resource = new ClassPathResource("pdf/sign_contract_pengran.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://jjy.uj345.com/"+pdfResultVo.getUrl()); + user.setContract("https://hapengran.com/"+pdfResultVo.getUrl()); waUsersDao.updateById(user); } return CommonResult.success(pdfResultVo); diff --git a/backend/crmeb-front/src/main/resources/application-hapr191.yml b/backend/crmeb-front/src/main/resources/application-hapr191.yml new file mode 100644 index 0000000..221a011 --- /dev/null +++ b/backend/crmeb-front/src/main/resources/application-hapr191.yml @@ -0,0 +1,54 @@ +crmeb: + imagePath: /www/wwwroot/hapengran.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://114.55.232.191:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 114.55.232.191 #地址 + 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的密码 diff --git a/backend/crmeb-front/src/main/resources/application.yml b/backend/crmeb-front/src/main/resources/application.yml index 2280dfb..a39bd93 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: shjjy153 + active: hapr191 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/resources/pdf/sign_contract_pengran.pdf b/backend/crmeb-front/src/main/resources/pdf/sign_contract_pengran.pdf new file mode 100644 index 0000000..a604a37 Binary files /dev/null and b/backend/crmeb-front/src/main/resources/pdf/sign_contract_pengran.pdf differ diff --git a/backend/deploy.conf b/backend/deploy.conf index 7b1c2cd..06e436a 100644 --- a/backend/deploy.conf +++ b/backend/deploy.conf @@ -80,3 +80,20 @@ REMOTE_DIR_ADMIN=/www/wwwroot/ccd-jfadmin.fwxgpt.com REMOTE_DIR_FRONT=/www/wwwroot/ccd-jf.fwxgpt.com +hapr191: + spring: + profiles: + active: hapr191 + +SERVER_HOST=114.55.232.191 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/javaapi +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar +REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.hapengran.com +REMOTE_DIR_FRONT=/www/wwwroot/jf.hapengran.com + + diff --git a/single_uniapp22miao/config/app.js b/single_uniapp22miao/config/app.js index d7fbde4..32ab6c8 100644 --- a/single_uniapp22miao/config/app.js +++ b/single_uniapp22miao/config/app.js @@ -6,7 +6,8 @@ // let domain = 'https://jfanyue.szxingming.com' // let domain = 'https://jf.wenjinhui.com' // let domain = 'https://jjy-jf.fwxgpt.com' -let domain = 'https://jjy-jf.uj345.com' +let domain = 'https://jf.hapengran.com' +// let domain = 'https://jjy-jf.uj345.com' // let domain = 'https://ccd-jf.cichude.com' module.exports = { @@ -15,7 +16,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'https://jjy-jf.uj345.com', + HTTP_H5_URL: 'https://jf.hapengran.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 0f647b8..bae2b20 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_ccd.pdf', + pdfUrl: '/static/sign_contract_pengran.pdf', userId: '', isMobile: false, usePdfJs: false, diff --git a/single_uniapp22miao/pages/integral/points.vue b/single_uniapp22miao/pages/integral/points.vue index c7000ab..ad53ea3 100644 --- a/single_uniapp22miao/pages/integral/points.vue +++ b/single_uniapp22miao/pages/integral/points.vue @@ -338,7 +338,7 @@ export default { // 跳转到抢购页面 goToRushBuy() { // #ifdef H5 - window.location.href = 'https://jjy.uj345.com/?#/pages/personal/index' + window.location.href = 'https://hapengran.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://anyue.szxingming.com/?#/pages/personal/index' @@ -347,7 +347,7 @@ export default { // #endif // #ifndef H5 uni.navigateTo({ - url: '/pages/web-view/index?url=' + encodeURIComponent('https://ccd.fwxgpt.com/?#/pages/personal/index') + url: '/pages/web-view/index?url=' + encodeURIComponent('https://hapengran.com/?#/pages/personal/index') }) // #endif }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue index aec789a..10f811e 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_jjy.pdf' + const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_pengran.pdf' this.pdfUrl = url }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign.vue b/single_uniapp22miao/pages/sub-pages/webview/sign.vue index 719aa34..fde31ee 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign.vue @@ -360,7 +360,7 @@ export default { }); // 返回 setTimeout(() => { - window.location.href = 'https://jjy.uj345.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') + window.location.href = 'https://hapengran.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://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') diff --git a/single_uniapp22miao/static/sign_contract_pengran.pdf b/single_uniapp22miao/static/sign_contract_pengran.pdf new file mode 100644 index 0000000..a604a37 Binary files /dev/null and b/single_uniapp22miao/static/sign_contract_pengran.pdf differ