Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sfzx-website
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
丁伟
sfzx-website
Commits
43b3e44e
Commit
43b3e44e
authored
Sep 18, 2020
by
丁伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、迁移初始提交
parent
483a183d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
36 deletions
+41
-36
.idea/.gitignore
+4
-2
.idea/dataSources.xml
+20
-0
docker-compose.yml
+14
-29
src/main/java/ccpit/base/controller/UploadFileController.java
+1
-1
src/main/resources/framework.properties
+1
-2
target/classes/framework.properties
+1
-2
No files found.
.idea/.gitignore
View file @
43b3e44e
# Default ignored files
/workspace.xml
\ No newline at end of file
/workspace.xml
# Datasource local storage ignored files
/dataSources.local.xml
\ No newline at end of file
.idea/dataSources.xml
0 → 100644
View file @
43b3e44e
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"DataSourceManagerImpl"
format=
"xml"
multifile-model=
"true"
>
<data-source
source=
"LOCAL"
name=
"MySQL - sfzxWebsite@localhost"
uuid=
"8589abe1-1b32-4f03-b9ae-b29236d686a1"
>
<driver-ref>
mysql.8
</driver-ref>
<synchronize>
true
</synchronize>
<jdbc-driver>
com.mysql.cj.jdbc.Driver
</jdbc-driver>
<jdbc-url>
jdbc:mysql://localhost:3306/sfzxWebsite
</jdbc-url>
<driver-properties>
<property
name=
"autoReconnect"
value=
"true"
/>
<property
name=
"zeroDateTimeBehavior"
value=
"CONVERT_TO_NULL"
/>
<property
name=
"tinyInt1isBit"
value=
"false"
/>
<property
name=
"characterEncoding"
value=
"utf8"
/>
<property
name=
"characterSetResults"
value=
"utf8"
/>
<property
name=
"yearIsDateType"
value=
"false"
/>
</driver-properties>
</data-source>
</component>
</project>
\ No newline at end of file
docker-compose.yml
View file @
43b3e44e
...
...
@@ -2,36 +2,22 @@ version: '3'
services
:
backend
:
command
:
[
"
java"
,
"
-jar"
,
"
/app.jar"
]
depends_on
:
-
mysql
environment
:
SPRING_DATASOURCE_URL
:
jdbc:mysql://mysql:3306/sfzx_website?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
FILE_UPLOAD_ROOT
:
/upload/files
image
:
bqluan/docker-openjdk:8-jre-alpine
ports
:
-
"
30077:8080"
volumes
:
-
./sfzx-website-0.0.1-SNAPSHOT.jar:/app.jar
-
./upload/files:/upload/files
networks
:
hx_net
:
ipv4_address
:
172.37.0.3
mysql
:
environment
:
MYSQL_ROOT_PASSWORD
:
root
image
:
itc/m
ariadb:10.2
image
:
itc/m
ysql:5.5
volumes
:
-
./database:/var/lib/mysql
networks
:
hx_net
:
ipv4_address
:
172.37.0.5
-
./mysql/data:/var/lib/mysql
-
./mysql/log:/var/log/mysql
command
:
mysqld --lower_case_table_names=1
networks
:
hx_net
:
driver
:
bridge
ipam
:
config
:
-
subnet
:
172.37.0.0/24
\ No newline at end of file
web
:
depends_on
:
-
mysql
image
:
itc/tomcat:8.5-jre8
volumes
:
-
./web:/usr/local/tomcat/webapps/ROOT
-
./logs:/logs
-
./upload:/upload
ports
:
-
"
30128:8080"
src/main/java/ccpit/base/controller/UploadFileController.java
View file @
43b3e44e
...
...
@@ -287,7 +287,7 @@ public class UploadFileController extends BaseController {
String
CKEditorFuncNum
=
request
.
getParameter
(
"CKEditorFuncNum"
);
String
fileName
=
request
.
getContextPath
()
+
uploadFile
(
request
);
PrintWriter
out
;
String
serverIp
=
"http://www.
expo-today.com
"
;
String
serverIp
=
"http://www.
co.ccpit.org
"
;
String
s
=
"<script type=\"text/javascript\">window.parent.CKEDITOR.tools.callFunction("
+
CKEditorFuncNum
+
", '"
...
...
src/main/resources/framework.properties
View file @
43b3e44e
...
...
@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516
# hibernate.X
hibernate.dialect
=
org.hibernate.dialect.MySQL5Dialect
hibernate.show_sql
=
false
hibernate.hbm2ddl.auto
=
updat
e
hibernate.hbm2ddl.auto
=
non
e
# oracle|mysql
database
=
mysql
...
...
@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u
# test server address
system.visit_url
=
# official server address
#system.visit_url=http://ccpit-tga.org
#upload File save path
system.uploadFilePath.dev
=
...
...
target/classes/framework.properties
View file @
43b3e44e
...
...
@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516
# hibernate.X
hibernate.dialect
=
org.hibernate.dialect.MySQL5Dialect
hibernate.show_sql
=
false
hibernate.hbm2ddl.auto
=
updat
e
hibernate.hbm2ddl.auto
=
non
e
# oracle|mysql
database
=
mysql
...
...
@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u
# test server address
system.visit_url
=
# official server address
#system.visit_url=http://ccpit-tga.org
#upload File save path
system.uploadFilePath.dev
=
...
...
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