Browse Source

'修改正式环境配置文件'

Althars123 4 years ago
parent
commit
e6b90bc04a

+ 4 - 6
zzjs-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -5,19 +5,17 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.user.service.IUserInfoService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 学员基本信息表 前端控制器
@@ -55,10 +53,10 @@ public class GzptUserInfoController extends BaseController {
      */
     @PutMapping(value = "/bind")
     @ApiOperation("绑定学员账号")
-    public Response<GzptUserInfo> getUserWxlogin(@RequestBody GzptUserInfoDTO gzptUserInfoDTO){
+    public Response getUserWxlogin(@RequestBody GzptUserInfoDTO gzptUserInfoDTO){
         GzptUserInfo gzptUserInfo = gzptUserInfoService.getUserWxlogin(gzptUserInfoDTO);
         if (gzptUserInfo == null){
-            throw new CustomException("学员账户不存在或者密码错误");
+            throw new CustomException("学员账户不存在或者密码错误");
         }
         //绑定用户与学员关系
         UserInfo student = SecurityUtils.getLoginUser().getStudent();

+ 9 - 9
zzjs-admin/src/main/resources/application-prod.yml

@@ -2,20 +2,20 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
+#        driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://218.85.55.253:3306/zzjs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://47.96.83.13:3306/zzjs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
-                password: 123456
+                password: miaxis110
             # 从库数据源
-            slave:
+            newgzpt:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
+                enabled: true
+                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
+                username: newgzpt
+                password: newgzpt2016
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -58,7 +58,7 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 47.96.83.13
         # 端口,默认为6379
         port: 6379
         # 密码