Commit 5cd40145 authored by Quxl's avatar Quxl

修改生产环境配置

parent 05af3bd8
package com.egolm.film.api.admin; package com.egolm.film.api.admin;
import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.egolm.common.bean.Rjx;
import com.egolm.film.api.admin.service.AdminUserService; import com.egolm.film.api.admin.service.AdminUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@Api @Api
@Controller @Controller
...@@ -16,4 +21,54 @@ public class AdminUserController { ...@@ -16,4 +21,54 @@ public class AdminUserController {
@Autowired @Autowired
AdminUserService service; AdminUserService service;
@ResponseBody
@RequestMapping("list")
@ApiOperation("用户分页查询")
public Object list(String keyword, String group_id, Long index, Long limit) {
return Rjx.jsonOk();
}
@ResponseBody
@RequestMapping("add")
@ApiOperation("添加用户")
public Object add(String realname, String username, String password, String group_id, Date expire_time, String email, String telphone) {
return Rjx.jsonOk();
}
@ResponseBody
@RequestMapping("del")
@ApiOperation("删除用户")
public Object del(String adminid) {
return Rjx.jsonOk();
}
@ResponseBody
@RequestMapping("group/list")
@ApiOperation("组分页查询")
public Object groupList(Long index, Long limit) {
return Rjx.jsonOk();
}
@ResponseBody
@RequestMapping("group/add")
@ApiOperation("添加组")
public Object groupAdd(String group_name, Integer state) {
return Rjx.jsonOk();
}
@ResponseBody
@RequestMapping("group/del")
@ApiOperation("删除组")
public Object groupDel(String group_id) {
return Rjx.jsonOk();
}
} }
...@@ -2,7 +2,6 @@ spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_critic_2018?useSSL=fals ...@@ -2,7 +2,6 @@ spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_critic_2018?useSSL=fals
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=egolm#2018 spring.datasource.password=egolm#2018
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.test-while-idle=true spring.datasource.test-while-idle=true
spring.datasource.test-on-borrow=false spring.datasource.test-on-borrow=false
spring.datasource.test-on-return=false spring.datasource.test-on-return=false
...@@ -14,7 +13,5 @@ spring.datasource.initial-size=10 ...@@ -14,7 +13,5 @@ spring.datasource.initial-size=10
spring.datasource.max-active=100 spring.datasource.max-active=100
spring.datasource.min-idle=10 spring.datasource.min-idle=10
###配置阿里云视频点播上传所需要的STS密钥
aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8 aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
\ No newline at end of file
spring.datasource.url=jdbc:mysql://10.10.0.111:3306/film_critic_2018?useSSL=false&useUnicode=true&characterEncoding=utf8 spring.datasource.url=jdbc:mysql://rm-uf690z5r42mm16f3r.mysql.rds.aliyuncs.com:3306/film_2019?useSSL=false&useUnicode=true&characterEncoding=utf8
spring.datasource.username=root spring.datasource.username=filmdb
spring.datasource.password=egolm#2018 spring.datasource.password=SMG@film#2018
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.test-while-idle=true spring.datasource.test-while-idle=true
spring.datasource.test-on-borrow=false spring.datasource.test-on-borrow=false
spring.datasource.test-on-return=false spring.datasource.test-on-return=false
...@@ -13,3 +12,6 @@ spring.datasource.max-wait=10000 ...@@ -13,3 +12,6 @@ spring.datasource.max-wait=10000
spring.datasource.initial-size=10 spring.datasource.initial-size=10
spring.datasource.max-active=100 spring.datasource.max-active=100
spring.datasource.min-idle=10 spring.datasource.min-idle=10
aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment