Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nyx
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
发现
nyx
Commits
36d84cb5
Commit
36d84cb5
authored
May 12, 2020
by
jscat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nyx: oss文件上传
desc: 第一版本的文件上传成功 func: 1. 文件上传至阿里云oss 2. 回调函数返回应用服务器 todo 1. 设计tag的格式 2. 从nyxkey应用服务器写数据到database
parent
c8663bd4
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
115 行增加
和
32 行删除
+115
-32
增值产品-小程序及app/nyx-master/app.js
+11
-1
增值产品-小程序及app/nyx-master/app.json
+11
-2
增值产品-小程序及app/nyx-master/config.js
+6
-3
增值产品-小程序及app/nyx-master/pages/key/key.js
+35
-4
增值产品-小程序及app/nyx-master/pages/key/key.json
+3
-5
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_ossServiceImpl.java
+20
-13
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
+26
-1
增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application.yml
+3
-3
没有找到文件。
增值产品-小程序及app/nyx-master/app.js
查看文件 @
36d84cb5
//app
.js
//app
.js
...
@@ -39,6 +39,16 @@ App({
...
@@ -39,6 +39,16 @@ App({
socketClose
:
false
,
socketClose
:
false
,
socketOpen
:
false
,
socketOpen
:
false
,
//文件上传数据格式
postData
:
{
photoArray
:
[],
photoTag
:
[],
photoTitle
:
""
,
photoContent
:
""
,
photoCategory
:
""
,
},
},
},
onLaunch
:
function
()
{
onLaunch
:
function
()
{
...
...
增值产品-小程序及app/nyx-master/app.json
查看文件 @
36d84cb5
{
{
...
@@ -13,7 +13,10 @@
...
@@ -13,7 +13,10 @@
"pages/my/rank/rank"
,
"pages/my/rank/rank"
,
"pages/my/user/user"
,
"pages/my/user/user"
,
"pages/my/myposts/myposts"
,
"pages/my/myposts/myposts"
,
"pages/logs/logs"
"pages/logs/logs"
,
"pages/post/post"
,
"pages/post/edit/edit"
,
"pages/post/submit/submit"
],
],
"window"
:
{
"window"
:
{
"backgroundTextStyle"
:
"light"
,
"backgroundTextStyle"
:
"light"
,
...
@@ -40,6 +43,12 @@
...
@@ -40,6 +43,12 @@
"selectedIconPath"
:
"./icon/discover2.png"
"selectedIconPath"
:
"./icon/discover2.png"
},
},
{
{
"pagePath"
:
"pages/post/post"
,
"text"
:
"添加"
,
"iconPath"
:
"./icon/add.png"
,
"selectedIconPath"
:
"./icon/add.png"
},
{
"pagePath"
:
"pages/key/key"
,
"pagePath"
:
"pages/key/key"
,
"text"
:
"知识"
,
"text"
:
"知识"
,
"iconPath"
:
"./icon/key.png"
,
"iconPath"
:
"./icon/key.png"
,
...
...
增值产品-小程序及app/nyx-master/config.js
查看文件 @
36d84cb5
//con
fig.js API全局域名配置
//con
fig.js API全局域名配置
//config.js API全局域名配置
//config.js API全局域名配置
var
prod
=
0
;
var
prod
=
0
;
var
local
=
1
;
var
local
=
0
;
var
test
=
0
;
var
test
=
1
;
var
debug
=
0
;
//是否打印调试信息
var
debug
=
0
;
//是否打印调试信息
var
host_key
=
"https://fun.hisuhong.com"
;
var
host_key
=
"https://fun.hisuhong.com"
;
...
@@ -52,5 +52,7 @@ var config={
...
@@ -52,5 +52,7 @@ var config={
city_query_url
:
host_key
+
"/api/nyx/city/query"
,
city_query_url
:
host_key
+
"/api/nyx/city/query"
,
member_query_url
:
host_key
+
"/api/nyx/member/pos/query"
,
member_query_url
:
host_key
+
"/api/nyx/member/pos/query"
,
socket_url
:
socket_url
,
socket_url
:
socket_url
,
oss_token_url
:
host_key
+
"/api/nyx/oss/getToken"
,
oss_callback_url
:
login_url
+
"/api/nyx/oss/callback"
,
}
}
module
.
exports
=
config
;
module
.
exports
=
config
;
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/key/key.js
查看文件 @
36d84cb5
// pa
ges/key/key.js
// pa
ges/key/key.js
...
@@ -322,9 +322,9 @@ Page({
...
@@ -322,9 +322,9 @@ Page({
//分享(带参数),在onLoad接收参数
//分享(带参数),在onLoad接收参数
onShareAppMessage
:
function
()
{
onShareAppMessage
:
function
()
{
return
{
return
{
title
:
'
xx小程序
'
,
title
:
'
让有趣被发现
'
,
path
:
'pages/
index/index?id=123&name="zansan"&age=23
'
,
// 路径,传递参数到指定页面。
path
:
'pages/
key/key
'
,
// 路径,传递参数到指定页面。
imageUrl
:
'../../i
mgs/avater.jp
g'
//自定义分享封面
imageUrl
:
'../../i
con/images/nyx.pn
g'
//自定义分享封面
}
}
},
},
/**
/**
...
@@ -551,6 +551,37 @@ const getData = (url, param) => {
...
@@ -551,6 +551,37 @@ const getData = (url, param) => {
})
})
}
}
//通过Promise方式进行敏感内容监测
const
messageCheck
=
(
url
,
param
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
/* start+of_wx.request */
wx
.
request
({
url
:
'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=your app id&secret=your secret'
,
method
:
'GET'
,
success
:
res
=>
{
var
access_token
=
res
.
data
.
access_token
;
wx
.
request
({
method
:
'POST'
,
url
:
'https://api.weixin.qq.com/wxa/msg_sec_check?access_token='
+
access_token
,
data
:
{
content
:
param
},
success
(
res
)
{
if
(
res
.
errcode
!==
87014
)
{
// 合格
}
}
})
},
fail
()
{
console
.
log
(
res
);
}
})
/* end_of_wx.request */
})
}
//表情文件
//表情文件
function
emotionFun
()
{
function
emotionFun
()
{
let
emoArr
=
[
let
emoArr
=
[
...
...
增值产品-小程序及app/nyx-master/pages/key/key.json
查看文件 @
36d84cb5
{
{
{
{
"usingComponents"
:
{
"usingComponents"
:
{},
"type-cmp"
:
"/components/type/type"
},
"navigationBarTitleText"
:
"让有趣被发现 - 酒肆"
"navigationBarTitleText"
:
"让有趣被发现 - 酒肆"
}
}
\ No newline at end of file
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_ossServiceImpl.java
查看文件 @
36d84cb5
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
...
@@ -112,6 +112,12 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -112,6 +112,12 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
public
JSONResult
Rockwell_ossServiceGetToken
(
String
userName
,
String
tokenName
)
public
JSONResult
Rockwell_ossServiceGetToken
(
String
userName
,
String
tokenName
)
{
{
/*
1. accessKeyId
2. accessKeySecret
3. securityToken
4. expiration
*/
Map
<
String
,
String
>
map
=
getSTSRoleAccessKeyId
(
userName
,
tokenName
);
Map
<
String
,
String
>
map
=
getSTSRoleAccessKeyId
(
userName
,
tokenName
);
return
getToken
(
map
);
return
getToken
(
map
);
}
}
...
@@ -124,6 +130,8 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -124,6 +130,8 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
String
accessId
=
map
.
get
(
"accessKeyId"
);
String
accessId
=
map
.
get
(
"accessKeyId"
);
//String accessKey = aliyunOssAccessKeySecret; // 请填写您的AccessKeySecret。
//String accessKey = aliyunOssAccessKeySecret; // 请填写您的AccessKeySecret。
String
accessKey
=
map
.
get
(
"accessKeySecret"
);
String
accessKey
=
map
.
get
(
"accessKeySecret"
);
String
securityToken
=
map
.
get
(
"securityToken"
);
String
endpoint
=
aliyunOssEndpoint
;
// 请填写您的 endpoint。
String
endpoint
=
aliyunOssEndpoint
;
// 请填写您的 endpoint。
String
bucket
=
aliyunOssBucket
;
// 请填写您的 bucketname 。
String
bucket
=
aliyunOssBucket
;
// 请填写您的 bucketname 。
String
host
=
"http://"
+
bucket
+
"."
+
endpoint
;
// host的格式为 bucketname.endpoint
String
host
=
"http://"
+
bucket
+
"."
+
endpoint
;
// host的格式为 bucketname.endpoint
...
@@ -134,7 +142,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -134,7 +142,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
OSSClient
client
=
new
OSSClient
(
endpoint
,
accessId
,
accessKey
);
OSSClient
client
=
new
OSSClient
(
endpoint
,
accessId
,
accessKey
);
Map
<
String
,
String
>
respMap
=
new
LinkedHashMap
<
String
,
String
>();
Map
<
String
,
String
>
respMap
=
new
LinkedHashMap
<
String
,
String
>();
try
{
try
{
long
expireTime
=
3
0
;
long
expireTime
=
6
0
;
long
expireEndTime
=
System
.
currentTimeMillis
()
+
expireTime
*
1000
;
long
expireEndTime
=
System
.
currentTimeMillis
()
+
expireTime
*
1000
;
Date
expiration
=
new
Date
(
expireEndTime
);
Date
expiration
=
new
Date
(
expireEndTime
);
PolicyConditions
policyConds
=
new
PolicyConditions
();
PolicyConditions
policyConds
=
new
PolicyConditions
();
...
@@ -147,6 +155,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -147,6 +155,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
String
postSignature
=
client
.
calculatePostSignature
(
postPolicy
);
String
postSignature
=
client
.
calculatePostSignature
(
postPolicy
);
respMap
.
put
(
"accessid"
,
accessId
);
respMap
.
put
(
"accessid"
,
accessId
);
respMap
.
put
(
"securityToken"
,
securityToken
);
respMap
.
put
(
"policy"
,
encodedPolicy
);
respMap
.
put
(
"policy"
,
encodedPolicy
);
respMap
.
put
(
"signature"
,
postSignature
);
respMap
.
put
(
"signature"
,
postSignature
);
respMap
.
put
(
"dir"
,
dir
);
respMap
.
put
(
"dir"
,
dir
);
...
@@ -154,13 +163,14 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -154,13 +163,14 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
respMap
.
put
(
"expire"
,
String
.
valueOf
(
expireEndTime
/
1000
));
respMap
.
put
(
"expire"
,
String
.
valueOf
(
expireEndTime
/
1000
));
// respMap.put("expire", formatISO8601Date(expiration));
// respMap.put("expire", formatISO8601Date(expiration));
JSONObject
jasonCallback
=
new
JSONObject
();
// 小程序里指定
jasonCallback
.
put
(
"callbackUrl"
,
callbackUrl
);
// JSONObject jasonCallback = new JSONObject();
jasonCallback
.
put
(
"callbackBody"
,
// jasonCallback.put("callbackUrl", callbackUrl);
"filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}"
);
// jasonCallback.put("callbackBody",
jasonCallback
.
put
(
"callbackBodyType"
,
"application/x-www-form-urlencoded"
);
// "filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}");
String
base64CallbackBody
=
BinaryUtil
.
toBase64String
(
jasonCallback
.
toString
().
getBytes
());
// jasonCallback.put("callbackBodyType", "application/x-www-form-urlencoded");
respMap
.
put
(
"callback"
,
base64CallbackBody
);
// String base64CallbackBody = BinaryUtil.toBase64String(jasonCallback.toString().getBytes());
// respMap.put("callback", base64CallbackBody);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// Assert.fail(e.getMessage());
// Assert.fail(e.getMessage());
...
@@ -172,12 +182,9 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
...
@@ -172,12 +182,9 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
return
json
;
return
json
;
}
}
//step1: 获取STS临时授权的token
//step1: 获取STS临时授
securityToken
权的token
public
Map
<
String
,
String
>
getSTSRoleAccessKeyId
(
String
userName
,
String
tokenName
)
public
Map
<
String
,
String
>
getSTSRoleAccessKeyId
(
String
userName
,
String
tokenName
)
{
{
// if (StringUtils.isBlank(userName) || StringUtils.isBlank(tokenName)) {
// return new JSONResult(ExceptionMsg.OSSTokenNameIsBlack);
// }
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
try
{
try
{
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
查看文件 @
36d84cb5
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
web
.
controller
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
web
.
controller
;
...
@@ -5,6 +5,7 @@ import cn.com.fun.nyxkey.api.service.*;
...
@@ -5,6 +5,7 @@ import cn.com.fun.nyxkey.api.service.*;
import
cn.com.fun.nyxkey.api.web.common.ResponseHelper
;
import
cn.com.fun.nyxkey.api.web.common.ResponseHelper
;
import
cn.com.fun.nyxkey.api.web.common.ResponseWrapper
;
import
cn.com.fun.nyxkey.api.web.common.ResponseWrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
io.swagger.annotations.*
;
import
io.swagger.annotations.*
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -47,5 +48,29 @@ public class OssApiController {
...
@@ -47,5 +48,29 @@ public class OssApiController {
return
ossService
.
Rockwell_ossServiceGetToken
(
userName
,
tokenName
);
return
ossService
.
Rockwell_ossServiceGetToken
(
userName
,
tokenName
);
}
}
// refer:
// https://blog.csdn.net/feiyst/article/details/88431621
// SpringBoot 出现 Content type 'application/x-www-form-urlencoded;charset=UTF-8' not supported
// 前端请求传Json对象则后端使用@RequestParam
// 前端请求传Json对象的字符串则后端使用@RequestBody。
@RequestMapping
(
value
=
"/nyx/oss/callback"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
JSONObject
callback
(
@RequestParam
(
value
=
"filename"
,
required
=
false
,
defaultValue
=
"0"
)
String
filename
,
@RequestParam
(
value
=
"size"
,
required
=
false
,
defaultValue
=
"0"
)
String
size
,
@RequestParam
(
value
=
"height"
,
required
=
false
,
defaultValue
=
"0"
)
String
height
,
@RequestParam
(
value
=
"width"
,
required
=
false
,
defaultValue
=
"0"
)
String
width
,
@RequestParam
(
value
=
"tag"
,
required
=
false
,
defaultValue
=
"0"
)
String
tag
,
@RequestParam
(
value
=
"title"
,
required
=
false
,
defaultValue
=
"0"
)
String
title
,
@RequestParam
(
value
=
"content"
,
required
=
false
,
defaultValue
=
"0"
)
String
content
,
@RequestParam
(
value
=
"category"
,
required
=
false
,
defaultValue
=
"0"
)
String
category
){
System
.
out
.
println
(
"===callback_\n"
);
System
.
out
.
println
(
"===filename: "
+
filename
+
"&tag="
+
tag
+
"&title="
+
title
+
"&content="
+
content
+
"&category="
+
category
);
JSONObject
result
=
new
JSONObject
();
result
.
put
(
"Status"
,
"OK"
);
return
result
;
}
}
}
增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application.yml
查看文件 @
36d84cb5
serve
r
:
serve
r
:
...
@@ -67,14 +67,14 @@ weixin:
...
@@ -67,14 +67,14 @@ weixin:
aliyun
:
aliyun
:
oss
:
oss
:
REGION_CN_HANGZHOU
:
cn-
hangzhou
REGION_CN_HANGZHOU
:
cn-
shanghai
AccessKeyID
:
LTAI4GA88LJ82UtfMUrozDp3
AccessKeyID
:
LTAI4GA88LJ82UtfMUrozDp3
AccessKeySecret
:
OWyAIN3OTobk9MuKvZ7DMnr5cJxNND
AccessKeySecret
:
OWyAIN3OTobk9MuKvZ7DMnr5cJxNND
STS_API_VERSION
:
2015-04-01
STS_API_VERSION
:
2015-04-01
RoleArn
:
acs:ram::1956317109339291:role/nyxtokengeneratorrolepolicy
RoleArn
:
acs:ram::1956317109339291:role/nyxtokengeneratorrolepolicy
PolicyFile
:
policy/bucket_full_access_policy.txt
PolicyFile
:
policy/bucket_full_access_policy.txt
TokenExpireTime
:
30
TokenExpireTime
:
30
endpoint
:
oss-cn-
hangzhou
.aliyuncs.com
endpoint
:
oss-cn-
shanghai
.aliyuncs.com
bucket
:
930-test-sh
bucket
:
930-test-sh
callbackUrl
:
http://88.88.88.88:8888
callbackUrl
:
http://88.88.88.88:8888
dir
:
user-dir/
dir
:
user-dir/
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论