diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index e85e885..151c407 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/teambuy-api/ +VUE_APP_API_BASE_URL=https://www.gwrx666.com/teambuy-api/ +//VUE_APP_API_BASE_URL=http://localhost:8000/teambuy-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 0eb5d85..0c082e6 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/teambuy-api/ +VUE_APP_API_BASE_URL=https://www.gwrx666.com/teambuy-api/ +//VUE_APP_API_BASE_URL=http://localhost:8000/teambuy-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/jeecg-boot-module-system/pom.xml b/jeecg-boot-module-system/pom.xml index 4ae1645..d09cfe7 100644 --- a/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot-module-system/pom.xml @@ -77,6 +77,7 @@ + teambuy-api org.springframework.boot diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/RecommendController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/RecommendController.java index 2f3d31e..fb079f1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/RecommendController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/RecommendController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -@Api(tags="我的-邀请好友&我的团队相关接口") +@Api(tags="我的-推广链接相关接口") @RestController @RequestMapping("/teambuy/share") @Slf4j @@ -32,12 +32,12 @@ public class RecommendController { return recommendService.getInviteCode(token); } - //我的团队-查询直推用户列表 - @ApiOperation(value="我的团队-查询直推用户列表", notes="我的-获取直推用户列表") - @RequestMapping(value = "/queryRecommendUserList", method = {RequestMethod.POST}) - public Result queryRecommendUserList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return recommendService.queryRecommendUserList(token, pageBean); - } +// //我的团队-查询直推用户列表 +// @ApiOperation(value="我的团队-查询直推用户列表", notes="我的-获取直推用户列表") +// @RequestMapping(value = "/queryRecommendUserList", method = {RequestMethod.POST}) +// public Result queryRecommendUserList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ +// return recommendService.queryRecommendUserList(token, pageBean); +// } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index b40d165..eb16385 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://8.138.162.67:3306/teambuy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://43.136.29.181:3306/teambuy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: Fk4q*h@V + password: Abc.123456 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 0 - host: 8.138.162.67 + host: 43.136.29.181 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'gmmGMM@2024' + password: 'Abc.123456' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tQSs47izVy8DLVdwUU9 - secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: hanhaiimage - staticDomain: https://image.hhlm1688.com/ + accessKey: LTAI5tH9gsQGSmDE3TtLzCqe + secretKey: iPBIWop0GOYKew65TJvEcKFOISlPUs + endpoint: oss-cn-guangzhou.aliyuncs.com + bucketName: gwrx666 + staticDomain: https://img.gwrx666.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES