Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
dbe4ea91
Commit
dbe4ea91
authored
Jul 02, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-bug
parent
b4b27786
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
17 deletions
+21
-17
AddressUtil.java
...main/java/cn/chnmuseum/party/common/util/AddressUtil.java
+0
-5
AuditServiceImpl.java
...ava/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
+1
-0
AssetController.java
...va/cn/chnmuseum/party/web/controller/AssetController.java
+4
-6
LoginController.java
...va/cn/chnmuseum/party/web/controller/LoginController.java
+1
-1
TAppVersionController.java
...chnmuseum/party/web/controller/TAppVersionController.java
+7
-5
application-dev.properties
src/main/resources/application-dev.properties
+2
-0
application.properties
src/main/resources/application.properties
+6
-0
No files found.
src/main/java/cn/chnmuseum/party/common/util/AddressUtil.java
View file @
dbe4ea91
package
cn
.
chnmuseum
.
party
.
common
.
util
;
import
cn.hutool.core.net.NetUtil
;
import
net.sf.json.JSONObject
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -146,9 +145,5 @@ public class AddressUtil {
return
map
;
}
public
static
void
main
(
String
[]
args
)
{
Map
<
String
,
String
>
addressByIp1
=
getAddressByIp
(
"192.168.207.244"
);
System
.
out
.
println
(
addressByIp1
);
}
}
\ No newline at end of file
src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
dbe4ea91
...
...
@@ -341,6 +341,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
}
}
one
.
setAuditStatus
(
audit
.
getStatus
());
one
.
setPublished
(
true
);
update
=
this
.
videoContentService
.
updateById
(
one
);
break
;
default
:
...
...
src/main/java/cn/chnmuseum/party/web/controller/AssetController.java
View file @
dbe4ea91
...
...
@@ -36,10 +36,7 @@ import org.springframework.web.bind.annotation.*;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.*
;
import
java.net.URLEncoder
;
import
java.nio.charset.StandardCharsets
;
import
java.time.LocalDateTime
;
...
...
@@ -47,6 +44,8 @@ import java.util.ArrayList;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipOutputStream
;
import
static
cn
.
chnmuseum
.
party
.
common
.
enums
.
FileCatEnum
.
EXHIBITION_BOARD_DATUM
;
...
...
@@ -148,7 +147,6 @@ public class AssetController extends BaseController {
final
String
fileName
=
TimeUtils
.
format
(
LocalDateTime
.
now
(),
TimeUtils
.
FORMAT_ONE
)
+
"视频集.zip"
;
response
.
addHeader
(
HttpHeaders
.
CONTENT_DISPOSITION
,
"attachment; filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
final
Map
<
String
,
InputStream
>
map
=
new
LinkedHashMap
<>(
idList
.
size
());
final
List
<
Asset
>
assetList
=
assetService
.
listByIds
(
idList
);
for
(
Asset
asset
:
assetList
)
{
...
...
@@ -176,7 +174,7 @@ public class AssetController extends BaseController {
}
@ApiOperation
(
value
=
"获取展板中的参考资料"
,
notes
=
"
后去
展板中的参考资料"
)
@ApiOperation
(
value
=
"获取展板中的参考资料"
,
notes
=
"
获取
展板中的参考资料"
)
@RequiresAuthentication
@GetMapping
(
"/getAssetByBoard"
)
public
Map
<
String
,
Object
>
getAssetByBoard
(
@RequestParam
(
value
=
"boardList"
,
required
=
true
)
List
<
String
>
boardList
){
...
...
src/main/java/cn/chnmuseum/party/web/controller/LoginController.java
View file @
dbe4ea91
...
...
@@ -338,7 +338,7 @@ public class LoginController extends BaseController {
// regUrl = request.getScheme() + "://" + request.getServerName() + "/h5/login";
}
else
{
regUrl
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":8088/plat/#/login"
;
// regUrl = request.getScheme() + "://" + request.getServerName() + "/
plat/#/login
";
// regUrl = request.getScheme() + "://" + request.getServerName() + "/
wdzcfwpt/
";
}
QrConfig
config
=
new
QrConfig
(
width
,
height
);
config
.
setCharset
(
StandardCharsets
.
UTF_8
);
...
...
src/main/java/cn/chnmuseum/party/web/controller/TAppVersionController.java
View file @
dbe4ea91
...
...
@@ -75,14 +75,16 @@ public class TAppVersionController extends BaseController {
tAppVersionService
.
updateBatchById
(
currentList
);
}
// 保存业务节点信息
boolean
result
=
tAppVersionService
.
save
(
tAppVersion
);
// 返回操作结果
if
(
result
)
{
return
getSuccessResult
();
}
else
{
try
{
tAppVersionService
.
save
(
tAppVersion
);
}
catch
(
Exception
e
)
{
logger
.
info
(
e
.
getMessage
());
// 保存失败
return
getFailResult
();
}
// 返回操作结果
return
getSuccessResult
();
}
@PutMapping
(
"/update"
)
...
...
src/main/resources/application-dev.properties
View file @
dbe4ea91
...
...
@@ -43,6 +43,7 @@ spring.datasource.druid.test-while-idle=true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.url
=
jdbc:mysql://192.168.110.93:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
#spring.datasource.druid.url=jdbc:mysql://10.18.121.26:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
#spring.datasource.druid.url=jdbc:mysql://172.19.173.122:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.druid.username
=
root
spring.datasource.druid.password
=
password
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
...
...
@@ -57,6 +58,7 @@ spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host
=
192.168.110.93
#spring.redis.host=10.18.121.26
#spring.redis.host=172.19.173.122
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port
=
6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
...
...
src/main/resources/application.properties
View file @
dbe4ea91
...
...
@@ -43,6 +43,12 @@ IMAGE_BASE_URL=http://111.203.232.175:8085/
#IMAGE_BASE_URL=http://101.96.131.110:9999/
# fdfs.tracker-list[0]=39.101.194.223:22122
#dfsFileAccessBasePath=http://39.101.194.223:9999
#prefixPat=/home/guobo/fastdfs/fastdfs_storage_data
#IMAGE_BASE_URL=http://39.101.194.223:9999/
########################################################
###Shiro
########################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment