Skip to content

N
nyx
Commit 84a15fa2 by jscat
Options

nyx javaapp: 功能更新 

1. 调整传参字段 productDesc, unitPrice
2. 将order的读取绑定user_id
3. tbl_address表的member_address改为urldecoder模式
parent e00fb766
正在显示 包含 64 行增加 和 26 行删除
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
package cn.com.fun.nyxkey.api.service.impl; package cn.com.fun.nyxkey.api.service.impl;
...@@ -613,14 +613,14 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -613,14 +613,14 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
//判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0 //判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
//如果所有的id 全为"0"，默认值，则返回参数错误 //如果所有的id 全为"0"，默认值，则返回参数错误
/* todo and user_id!='' 防止刷数据 */ /* user_id!='' 防止刷数据 */
// if(userId.equals("0")) if(StringUtils.isEmpty(userId) || userId.equals("0"))
// { {
// return new JSONResult(ExceptionMsg.ParamError); return new JSONResult(ExceptionMsg.ParamError);
// } }
rockwell_keyT_orderQuery.setUserId(userId); rockwell_keyT_orderQuery.setUserId(userId);
// rockwell_keyT_orderQuery.setOrderStatus(orderStatus); // orderStatus 可能是一类组合 10::20 这样, 不建议直接通过setOrderStatus来设置
List<String> ids = Arrays.asList(orderStatus.split("::")); List<String> ids = Arrays.asList(orderStatus.split("::"));
rockwell_keyT_orderQuery.setIds(ids); rockwell_keyT_orderQuery.setIds(ids);
rockwell_keyT_orderQuery.setPagination(new Pagination(pageNum, pageCount)); rockwell_keyT_orderQuery.setPagination(new Pagination(pageNum, pageCount));
...@@ -704,7 +704,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -704,7 +704,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
1. add tbl_member 1. add tbl_member
2. add tbl_member_user 2. add tbl_member_user
*/ */
// @Transactional //@Transactional
public int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) throws UnsupportedEncodingException public int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) throws UnsupportedEncodingException
{ {
LOGGER.debug("find Rockwell_keyServiceAddT_member"); LOGGER.debug("find Rockwell_keyServiceAddT_member");
...@@ -742,7 +742,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -742,7 +742,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
Rockwell_keyT_address rockwell_keyT_address = new Rockwell_keyT_address(); Rockwell_keyT_address rockwell_keyT_address = new Rockwell_keyT_address();
rockwell_keyT_address.setAddressId(addressId); rockwell_keyT_address.setAddressId(addressId);
rockwell_keyT_address.setClientId(memberId); rockwell_keyT_address.setClientId(memberId);
rockwell_keyT_address.setAddressName(memberAddress); rockwell_keyT_address.setAddressName(URLDecoder.decode(memberAddress, "UTF-8"));
rockwell_keyT_address.setAddressStatus("01"); rockwell_keyT_address.setAddressStatus("01");
rockwell_keyT_address.setCreateDatetime(new Date()); rockwell_keyT_address.setCreateDatetime(new Date());
rockwell_keyT_address.setUpdateDatetime(new Date()); rockwell_keyT_address.setUpdateDatetime(new Date());
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_ossServiceImpl.java
package cn.com.fun.nyxkey.api.service.impl; package cn.com.fun.nyxkey.api.service.impl;
...@@ -133,7 +133,12 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService { ...@@ -133,7 +133,12 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
4. expiration 4. expiration
*/ */
Map<String, String> map = getSTSRoleAccessKeyId(userName, tokenName); Map<String, String> map = getSTSRoleAccessKeyId(userName, tokenName);
return getToken(map, dir); String dirType = aliyunOssDir;
if(dir.equals("logoToken"))
{
dirType = aliyunOssDirLogo;
}
return getToken(map, dirType);
} }
//step2: 获取上传的参数 //step2: 获取上传的参数
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
package cn.com.fun.nyxkey.api.web.controller; package cn.com.fun.nyxkey.api.web.controller;
...@@ -44,13 +44,13 @@ public class OssApiController { ...@@ -44,13 +44,13 @@ public class OssApiController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userName", value = "用户名", required = false, dataType = "String", defaultValue = "1"), @ApiImplicitParam(name = "userName", value = "用户名", required = false, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "tokenName", value = "android传入android，ios传入ios", required = false, dataType = "String", defaultValue = "1"), @ApiImplicitParam(name = "tokenName", value = "android传入android，ios传入ios", required = false, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "dirType", value = "上传的目录", required = true, dataType = "String", defaultValue = "user-dir/") @ApiImplicitParam(name = "dirType", value = "上传的token类型: userToken|logoToken", required = true, dataType = "String", defaultValue = "userToken")
}) })
@RequestMapping(value = "/nyx/oss/getToken", method = RequestMethod.GET) @RequestMapping(value = "/nyx/oss/getToken", method = RequestMethod.GET)
public JSONResult RockwellAliyunOssGetToken( public JSONResult RockwellAliyunOssGetToken(
@RequestParam(value = "userName", required = false, defaultValue = "1") String userName, @RequestParam(value = "userName", required = false, defaultValue = "1") String userName,
@RequestParam(value = "tokenName", required = false, defaultValue = "ios") String tokenName, @RequestParam(value = "tokenName", required = false, defaultValue = "ios") String tokenName,
@RequestParam(value = "dirType", required = false, defaultValue = "user-dir/") String dirType @RequestParam(value = "dirType", required = false, defaultValue = "userToken") String dirType
) { ) {
return ossService.Rockwell_ossServiceGetToken(userName, tokenName, dirType); return ossService.Rockwell_ossServiceGetToken(userName, tokenName, dirType);
...@@ -104,8 +104,8 @@ public class OssApiController { ...@@ -104,8 +104,8 @@ public class OssApiController {
@RequestParam(value = "userId", required = false, defaultValue = "0") String userId, @RequestParam(value = "userId", required = false, defaultValue = "0") String userId,
@RequestParam(value = "startDatetime", required = false, defaultValue = "0") String startDatetime, @RequestParam(value = "startDatetime", required = false, defaultValue = "0") String startDatetime,
@RequestParam(value = "endDatetime", required = false, defaultValue = "0") String endDatetime, @RequestParam(value = "endDatetime", required = false, defaultValue = "0") String endDatetime,
@RequestParam(value = "desc", required = false, defaultValue = "0") List<String> desc, @RequestParam(value = "productDesc", required = false, defaultValue = "0") List<String> desc,
@RequestParam(value = "price", required = false, defaultValue = "0") List<Double> price, @RequestParam(value = "unitPrice", required = false, defaultValue = "0") List<Double> price,
@RequestParam(value = "quantity", required = false, defaultValue = "0") List<Integer> quantity @RequestParam(value = "quantity", required = false, defaultValue = "0") List<Integer> quantity
) throws UnsupportedEncodingException { ) throws UnsupportedEncodingException {
......
增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -508,8 +508,7 @@ limitations under the License. ...@@ -508,8 +508,7 @@ limitations under the License.
where 1=1 where 1=1
AND DATE_FORMAT(NOW(),'%Y-%m-%d') &lt;= DATE_FORMAT(end_datetime,'%Y-%m-%d') AND DATE_FORMAT(NOW(),'%Y-%m-%d') &lt;= DATE_FORMAT(end_datetime,'%Y-%m-%d')
<if test="userId != null and userId != '' "> <if test="userId != null and userId != '' ">
<!-- todo need to fix user_id match for collection after online --> AND user_id=#{userId}
<!-- AND user_id=#{userId} -->
</if> </if>
<if test="collectStatus != null and collectStatus != '' "> <if test="collectStatus != null and collectStatus != '' ">
AND collect_status=#{collectStatus} AND collect_status=#{collectStatus}
......
增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application-dev.yml
################################################################################################################# #################################################################################################################
...@@ -59,4 +59,20 @@ spring: ...@@ -59,4 +59,20 @@ spring:
idle-timeout: 60000 idle-timeout: 60000
max-lifetime: 100000 max-lifetime: 100000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
\ No newline at end of file
aliyun:
oss:
REGION_CN_HANGZHOU: cn-shanghai
AccessKeyID: LTAI4GA88LJ82UtfMUrozDp3
AccessKeySecret: OWyAIN3OTobk9MuKvZ7DMnr5cJxNND
STS_API_VERSION: 2015-04-01
RoleArn: acs:ram::1956317109339291:role/nyxtokengeneratorrolepolicy
PolicyFile: policy/bucket_full_access_policy.txt
TokenExpireTime: 30
endpoint: oss-cn-shanghai.aliyuncs.com
bucket: 930-test-sh
callbackUrl: http://88.88.88.88:8888
dir: user-dir/
dirQrcode: qrcode-dir/
dirLogo: logo-dir/
\ No newline at end of file
增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application-production.yml
################################################################################################################# #################################################################################################################
...@@ -56,4 +56,20 @@ spring: ...@@ -56,4 +56,20 @@ spring:
pool-name: DatebookHikariCP pool-name: DatebookHikariCP
max-lifetime: 120000 max-lifetime: 120000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
\ No newline at end of file
aliyun:
oss:
REGION_CN_HANGZHOU: cn-shanghai
AccessKeyID: LTAI4GA88LJ82UtfMUrozDp3
AccessKeySecret: OWyAIN3OTobk9MuKvZ7DMnr5cJxNND
STS_API_VERSION: 2015-04-01
RoleArn: acs:ram::1956317109339291:role/nyxtokengeneratorrolepolicy
PolicyFile: policy/bucket_full_access_policy.txt
TokenExpireTime: 30
endpoint: oss-cn-shanghai.aliyuncs.com
bucket: 930-prod-sh
callbackUrl: http://88.88.88.88:8888
dir: user-dir/
dirQrcode: qrcode-dir/
dirLogo: logo-dir/
\ No newline at end of file
增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/policy/bucket_full_access_policy.txt
{ {
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
"Resource": [ "Resource": [
"acs:oss:*:*:930-test-sh", "acs:oss:*:*:930-test-sh",
"acs:oss:*:*:930-test-sh/*" "acs:oss:*:*:930-test-sh/*"
"acs:oss:*:*:930-prod-sh",
"acs:oss:*:*:930-prod-sh/*"
] ]
} }
], ],
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论