Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
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
base_platform_enterprise
gic-platform-enterprise
Commits
80a4b69c
Commit
80a4b69c
authored
Aug 12, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小程序二维码修改
parent
e33bdc23
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
17 deletions
+11
-17
Test.java
...rprise-web/src/main/java/com/gic/enterprise/web/Test.java
+0
-7
QrcodeController.java
...a/com/gic/enterprise/web/controller/QrcodeController.java
+6
-3
WmStoreSyncController.java
...c/enterprise/web/controller/wm/WmStoreSyncController.java
+2
-3
QrcodeUtils.java
...c/main/java/com/gic/enterprise/web/utils/QrcodeUtils.java
+3
-4
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/Test.java
deleted
100644 → 0
View file @
e33bdc23
package
com
.
gic
.
enterprise
.
web
;
public
class
Test
{
public
static
void
main
(
String
[]
args
){
System
.
out
.
println
(
"cooperate-detail?collaboratorId=1"
.
split
(
"[?]"
)[
0
]);
}
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/QrcodeController.java
View file @
80a4b69c
...
...
@@ -32,6 +32,8 @@ import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
import
com.gic.wechat.business.api.service.wxa.WeixinWxaFunService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -47,6 +49,7 @@ import java.util.zip.ZipOutputStream;
@RestController
public
class
QrcodeController
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
QrcodeController
.
class
)
@Autowired
private
QrCodeApiService
qrCodeApiService
;
@Autowired
...
...
@@ -275,7 +278,7 @@ public class QrcodeController {
try
{
zipOutputStream
=
new
ZipOutputStream
(
new
FileOutputStream
(
file
));
}
catch
(
FileNotFoundException
e
)
{
e
.
printStackTrace
(
);
logger
.
warn
(
"e"
,
e
);
}
for
(
QrcodeContent
content
:
qrcodeQO
.
getContent
())
{
QrcodeDTO
dto
=
EntityUtil
.
changeEntityByJSON
(
QrcodeDTO
.
class
,
qrcodeQO
);
...
...
@@ -329,13 +332,13 @@ public class QrcodeController {
zipOutputStream
.
closeEntry
();
zipOutputStream
.
close
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
logger
.
warn
(
"e"
,
e
);
}
String
url
=
FileOperateUtils
.
simpleUploadFileFromLocal
(
file
,
fileName
+
".zip"
,
BucketNameEnum
.
COMPRESS_60000
.
getName
());
downloadReportApiService
.
updateDownloadUrl
(
downLoadId
,
"https://"
+
url
);
}
catch
(
IOException
e1
)
{
e1
.
printStackTrace
(
);
logger
.
warn
(
"e"
,
e1
);
}
}
}).
start
();
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java
View file @
80a4b69c
...
...
@@ -1008,7 +1008,6 @@ public class WmStoreSyncController {
writer
.
flush
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
LOGGER
.
error
(
"导出错误"
,
e
);
}
finally
{
if
(
writer
!=
null
)
{
...
...
@@ -1076,9 +1075,9 @@ public class WmStoreSyncController {
}
}
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
LOGGER
.
warn
(
"e"
,
e
);
}
catch
(
InvalidFormatException
e
)
{
e
.
printStackTrace
(
);
LOGGER
.
warn
(
"e"
,
e
);
}
return
result
;
}
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/QrcodeUtils.java
View file @
80a4b69c
...
...
@@ -56,11 +56,11 @@ public class QrcodeUtils {
InputStream
in
=
conn
.
getInputStream
();
return
IOUtils
.
toByteArray
(
in
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
log
.
warn
(
"e"
,
e
);
return
null
;
}
}
catch
(
MalformedURLException
e
)
{
e
.
printStackTrace
(
);
log
.
warn
(
"e"
,
e
);
return
null
;
}
}
...
...
@@ -134,8 +134,7 @@ public class QrcodeUtils {
logo
.
flush
();
image
.
flush
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
log
.
error
(
e
.
getMessage
());
log
.
warn
(
"e"
,
e
);
}
}
...
...
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