初审列表

src/main/java/com/egolm/film/api/admin/AdminCommonController.java

-package com.egolm.film.api.admin;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.egolm.film.api.admin.service.AdminCommonService;
-
-import io.swagger.annotations.Api;
-
-@Api
-@Controller
-@RequestMapping("admin/common")
-public class AdminCommonController {
-
-	@Autowired
-	AdminCommonService service;
-	
-}

src/main/java/com/egolm/film/api/admin/AdminFilmGroupController.java

-package com.egolm.film.api.admin;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-
-import com.egolm.film.api.admin.service.AdminFilmGroupService;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import io.swagger.annotations.Api;
-
-@Api
-@Controller
-@RequestMapping("admin/film_group")
-public class AdminFilmGroupController {
-
-	@Autowired
-	AdminFilmGroupService service;
-	
-}

src/main/java/com/egolm/film/api/admin/AdminFirstController.java

@@ -37,7 +37,7 @@ public class AdminFirstController {
 	
 	@ResponseBody
 	@PostMapping("list")
-	@ApiOperation("管理员分页查询")
+	@ApiOperation("初审列表分页查询")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="string",  required=false, name="keyword",     value="关键字"),
 		@ApiImplicitParam(paramType="query", dataType="integer", required=false, name="apply_state", value="状态"),
@@ -46,11 +46,11 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",       value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",       value="分页大小"),
 	})
-	public Object list(String keyword, Integer state, String film_type, String enroll_type, Long index, Long limit) {
+	public Object list(String keyword, Integer apply_state, String film_type, String enroll_type, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);
-		List<Map<String, Object>> list = memberService.queryChuShenList(keyword, state, film_type, enroll_type, page);
+		List<Map<String, Object>> list = memberService.queryChuShenList(keyword, apply_state, film_type, enroll_type, page);
 		return Rjx.jsonOk().setData(list);
 	}
 	

src/main/java/com/egolm/film/api/admin/service/AdminCommonService.java

-package com.egolm.film.api.admin.service;
-
-public interface AdminCommonService {
-
-}

src/main/java/com/egolm/film/api/admin/service/AdminFilmGroupService.java

-package com.egolm.film.api.admin.service;
-
-public interface AdminFilmGroupService {
-
-}

src/main/java/com/egolm/film/api/admin/service/impl/AdminCommonServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.egolm.common.jdbc.JdbcTemplate;
-import com.egolm.film.api.admin.service.AdminCommonService;
-
-@Service
-public class AdminCommonServiceImpl implements AdminCommonService {
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-}

src/main/java/com/egolm/film/api/admin/service/impl/AdminFilmGroupServiceImpl.java

-package com.egolm.film.api.admin.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.egolm.common.jdbc.JdbcTemplate;
-import com.egolm.film.api.admin.service.AdminFilmGroupService;
-
-@Service
-public class AdminFilmGroupServiceImpl implements AdminFilmGroupService {
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-}

src/main/java/com/egolm/film/util/AliyunSign.java

@@ -21,8 +21,6 @@ import javax.crypto.spec.SecretKeySpec;
 import com.egolm.common.DateUtil;
 import com.egolm.common.StringUtil;
  
-import sun.misc.BASE64Encoder;
- 
 
 public class AliyunSign {
 	  private final static Logger LOG = Logger.getLogger(AliyunSign.class.getName());
@@ -108,7 +106,7 @@ public class AliyunSign {
                 mac.init(signKey);
                 byte[] rawHmac = mac.doFinal(stringtoSign.getBytes());
                 //按照Base64 编码规则把上面的 HMAC 值编码成字符串，即得到签名值（Signature）
-                return new String(new BASE64Encoder().encode(rawHmac));
+                return StringUtil.encodeBase64String(rawHmac);
             } catch (Exception e) {
                 throw new SignatureException("Failed to generate HMAC : " + e.getMessage());
             }

src/main/java/com/egolm/film/util/AliyunUtil.java

@@ -20,8 +20,8 @@ import com.aliyuncs.vod.model.v20170321.RefreshUploadVideoResponse;
 import com.egolm.common.HttpsUtil;
 
 public class AliyunUtil {
-	private static String accessKeyId = "";//"LTAIOtHCCpDLXYp8";
-	private static String accessKeySecret = "";//"9XTHW7P9TTRvCsBHBSclOue2tdWOoa";
+	private String accessKeyId = "";//"LTAIOtHCCpDLXYp8";
+	private String accessKeySecret = "";//"9XTHW7P9TTRvCsBHBSclOue2tdWOoa";
 
 	private  final  DefaultAcsClient aliyunClient;
 
@@ -131,6 +131,7 @@ public class AliyunUtil {
 	}
 	
 	
+	@SuppressWarnings("deprecation")
 	public void createSts() {
 		String endpoint = "sts.aliyuncs.com";
         String accessKeyId = this.accessKeyId;