Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
LuJin-Im
Project
Project
Details
Activity
Releases
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
yangzhaojun
LuJin-Im
Commits
07b15be4
Commit
07b15be4
authored
Jul 09, 2018
by
李博今
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改网站图标
parent
13c54fd7
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
31 additions
and
7 deletions
+31
-7
FilesInfoServiceImpl.java
...qiim/webserver/sys/service/impl/FilesInfoServiceImpl.java
+10
-4
ImController.java
...va/com/qiqiim/webserver/user/controller/ImController.java
+9
-0
bot.jsp
src/main/webapp/WEB-INF/page/bot.jsp
+2
-1
chat.jsp
src/main/webapp/WEB-INF/page/chat.jsp
+1
-0
groupchat.jsp
src/main/webapp/WEB-INF/page/groupchat.jsp
+1
-0
historymessage.jsp
src/main/webapp/WEB-INF/page/historymessage.jsp
+1
-0
layim.jsp
src/main/webapp/WEB-INF/page/layim.jsp
+2
-1
layimmobile.jsp
src/main/webapp/WEB-INF/page/layimmobile.jsp
+1
-0
message.jsp
src/main/webapp/WEB-INF/page/message.jsp
+1
-0
im.css
src/main/webapp/css/im.css
+1
-1
icon.ico
src/main/webapp/img/icon.ico
+0
-0
iron.png
src/main/webapp/img/im/iron.png
+0
-0
index.jsp
src/main/webapp/index.jsp
+1
-0
login.jsp
src/main/webapp/login.jsp
+1
-0
No files found.
src/main/java/com/qiqiim/webserver/sys/service/impl/FilesInfoServiceImpl.java
View file @
07b15be4
...
@@ -4,6 +4,8 @@ import java.io.File;
...
@@ -4,6 +4,8 @@ import java.io.File;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
...
@@ -13,7 +15,7 @@ import com.qiqiim.webserver.util.FileUtil;
...
@@ -13,7 +15,7 @@ import com.qiqiim.webserver.util.FileUtil;
public
class
FilesInfoServiceImpl
implements
FilesInfoService
{
public
class
FilesInfoServiceImpl
implements
FilesInfoService
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
FilesInfoServiceImpl
.
class
);
public
int
saveUserPicture
(
MultipartFile
file
,
Long
uid
,
String
path
)
{
public
int
saveUserPicture
(
MultipartFile
file
,
Long
uid
,
String
path
)
{
int
result
=
0
;
int
result
=
0
;
...
@@ -39,6 +41,9 @@ public class FilesInfoServiceImpl implements FilesInfoService {
...
@@ -39,6 +41,9 @@ public class FilesInfoServiceImpl implements FilesInfoService {
public
String
savePicture
(
MultipartFile
file
,
String
newname
,
String
path
)
{
public
String
savePicture
(
MultipartFile
file
,
String
newname
,
String
path
)
{
String
fileUrl
=
""
;
String
fileUrl
=
""
;
logger
.
error
(
">> FilesInfoServiceImpl's file.getOriginalFilename() "
+
file
.
getOriginalFilename
());
logger
.
error
(
">> FilesInfoServiceImpl's newname "
+
newname
);
logger
.
error
(
">> FilesInfoServiceImpl's path "
+
path
);
if
(
StringUtils
.
isEmpty
(
file
.
getOriginalFilename
())){
if
(
StringUtils
.
isEmpty
(
file
.
getOriginalFilename
())){
return
fileUrl
;
return
fileUrl
;
}
}
...
@@ -48,6 +53,7 @@ public class FilesInfoServiceImpl implements FilesInfoService {
...
@@ -48,6 +53,7 @@ public class FilesInfoServiceImpl implements FilesInfoService {
if
(
b
){
if
(
b
){
try
{
try
{
File
tempFile
=
new
File
(
path
,
newname
+
"."
+
name
[
1
]);
File
tempFile
=
new
File
(
path
,
newname
+
"."
+
name
[
1
]);
logger
.
error
(
">> FilesInfoServiceImpl's tempFile.getAbsolutePath() "
+
tempFile
.
getAbsolutePath
());
FileUtils
.
copyInputStreamToFile
(
file
.
getInputStream
(),
tempFile
);
FileUtils
.
copyInputStreamToFile
(
file
.
getInputStream
(),
tempFile
);
fileUrl
=
newname
+
"."
+
name
[
1
];
fileUrl
=
newname
+
"."
+
name
[
1
];
//大图裁剪
//大图裁剪
...
...
src/main/java/com/qiqiim/webserver/user/controller/ImController.java
View file @
07b15be4
...
@@ -12,6 +12,8 @@ import com.qiqiim.webserver.user.dao.UserAdminInfoDao;
...
@@ -12,6 +12,8 @@ import com.qiqiim.webserver.user.dao.UserAdminInfoDao;
import
com.qiqiim.webserver.user.model.*
;
import
com.qiqiim.webserver.user.model.*
;
import
com.qiqiim.webserver.user.service.*
;
import
com.qiqiim.webserver.user.service.*
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
@@ -57,6 +59,8 @@ public class ImController extends BaseController {
...
@@ -57,6 +59,8 @@ public class ImController extends BaseController {
@Autowired
@Autowired
private
UserInfoService
userInfoServiceImpl
;
private
UserInfoService
userInfoServiceImpl
;
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ImController
.
class
);
/**
/**
* 单聊
* 单聊
*/
*/
...
@@ -276,6 +280,11 @@ public class ImController extends BaseController {
...
@@ -276,6 +280,11 @@ public class ImController extends BaseController {
UserAccountEntity
u
=
getLoginUser
();
UserAccountEntity
u
=
getLoginUser
();
Long
uid
=
u
.
getId
();
Long
uid
=
u
.
getId
();
String
path
=
request
.
getSession
().
getServletContext
().
getRealPath
(
"upload/img/temp/"
);
String
path
=
request
.
getSession
().
getServletContext
().
getRealPath
(
"upload/img/temp/"
);
String
path2
=
request
.
getSession
().
getServletContext
().
getRealPath
(
"/upload/img/temp/"
);
String
path3
=
request
.
getSession
().
getServletContext
().
getRealPath
(
"/"
);
logger
.
error
(
">> ImController's path "
+
path
);
logger
.
error
(
">> ImController's path2 "
+
path2
);
logger
.
error
(
">> ImController's path3 "
+
path3
);
String
files
=
filesInfoServiceImpl
.
savePicture
(
file
,
uid
.
toString
()
+
UUID
.
randomUUID
().
toString
(),
path
);
String
files
=
filesInfoServiceImpl
.
savePicture
(
file
,
uid
.
toString
()
+
UUID
.
randomUUID
().
toString
(),
path
);
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
String
>
submap
=
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
submap
=
new
HashMap
<
String
,
String
>();
...
...
src/main/webapp/WEB-INF/page/bot.jsp
View file @
07b15be4
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
机器人
</title>
<title>
机器人
</title>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/message.js"
></script>
<script
type=
"text/javascript"
src=
"js/message.js"
></script>
...
...
src/main/webapp/WEB-INF/page/chat.jsp
View file @
07b15be4
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
<head>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
单聊
</title>
<title>
单聊
</title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/skin-min.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/skin-min.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
...
...
src/main/webapp/WEB-INF/page/groupchat.jsp
View file @
07b15be4
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
<head>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
群聊
</title>
<title>
群聊
</title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
...
...
src/main/webapp/WEB-INF/page/historymessage.jsp
View file @
07b15be4
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<title>
聊天记录
</title>
<title>
聊天记录
</title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<%@ include
file=
"/WEB-INF/page/public/meta.jsp"
%>
<%@ include
file=
"/WEB-INF/page/public/meta.jsp"
%>
<style>
<style>
...
...
src/main/webapp/WEB-INF/page/layim.jsp
View file @
07b15be4
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
<html>
<html>
<head>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
置业顾问系统
</title>
<title>
置业顾问系统
</title
<link
href="img/icon.ico"
rel="SHORTCUT
ICON"
/
>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"css/im.css"
/>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
...
...
src/main/webapp/WEB-INF/page/layimmobile.jsp
View file @
07b15be4
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<meta
name=
"viewport"
content=
"width=device-width, height=device-height, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"
>
<meta
name=
"viewport"
content=
"width=device-width, height=device-height, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"
>
<meta
name=
"format-detection"
content=
"telephone=no"
>
<meta
name=
"format-detection"
content=
"telephone=no"
>
<title>
置业顾问系统
</title>
<title>
置业顾问系统
</title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
rel=
"stylesheet"
href=
"layuimobile/css/layui.css"
media=
"all"
/>
<link
rel=
"stylesheet"
href=
"layuimobile/css/layui.css"
media=
"all"
/>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/util.js"
></script>
<script
type=
"text/javascript"
src=
"js/message.js"
></script>
<script
type=
"text/javascript"
src=
"js/message.js"
></script>
...
...
src/main/webapp/WEB-INF/page/message.jsp
View file @
07b15be4
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<title>
消息盒子
</title>
<title>
消息盒子
</title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<%@ include
file=
"/WEB-INF/page/public/meta.jsp"
%>
<%@ include
file=
"/WEB-INF/page/public/meta.jsp"
%>
<style>
<style>
.layim-msgbox
{
margin
:
15px
;}
.layim-msgbox
{
margin
:
15px
;}
...
...
src/main/webapp/css/im.css
View file @
07b15be4
...
@@ -8290,7 +8290,7 @@ ul.weather-tpl li>span:nth-of-type(5) {
...
@@ -8290,7 +8290,7 @@ ul.weather-tpl li>span:nth-of-type(5) {
float
:
left
;
float
:
left
;
height
:
100%
;
height
:
100%
;
width
:
110px
;
width
:
110px
;
background
:
url(../img/icon.
png
)
right
0
no-repeat
#5885eb
;
background
:
url(../img/icon.
ico
)
right
0
no-repeat
#5885eb
;
color
:
#fff
;
color
:
#fff
;
text-align
:
center
;
text-align
:
center
;
cursor
:
pointer
;
cursor
:
pointer
;
...
...
src/main/webapp/img/icon.ico
0 → 100644
View file @
07b15be4
1.67 KB
src/main/webapp/img/im/iron.png
0 → 100644
View file @
07b15be4
1.67 KB
src/main/webapp/index.jsp
View file @
07b15be4
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<head>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title></title>
<title></title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<style
type=
"text/css"
>
<style
type=
"text/css"
>
.index-button
{
margin-bottom
:
30px
;}
.index-button
{
margin-bottom
:
30px
;}
...
...
src/main/webapp/login.jsp
View file @
07b15be4
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,chrome=1"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,chrome=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
>
<title></title>
<title></title>
<link
href=
"img/icon.ico"
rel=
"SHORTCUT ICON"
/>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
<link
rel=
"stylesheet"
href=
"layui/css/layui.css"
>
</head>
</head>
<body>
<body>
...
...
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