Commit 43b3e44e by 丁伟

1、迁移初始提交

parent 483a183d
# Default ignored files # Default ignored files
/workspace.xml /workspace.xml
# Datasource local storage ignored files
/dataSources.local.xml
\ No newline at end of file
<?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
...@@ -2,36 +2,22 @@ version: '3' ...@@ -2,36 +2,22 @@ version: '3'
services: 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: mysql:
environment: environment:
MYSQL_ROOT_PASSWORD: root MYSQL_ROOT_PASSWORD: root
image: itc/mariadb:10.2 image: itc/mysql:5.5
volumes: volumes:
- ./database:/var/lib/mysql - ./mysql/data:/var/lib/mysql
networks: - ./mysql/log:/var/log/mysql
hx_net: command: mysqld --lower_case_table_names=1
ipv4_address: 172.37.0.5
networks: web:
hx_net: depends_on:
driver: bridge - mysql
ipam: image: itc/tomcat:8.5-jre8
config: volumes:
- subnet: 172.37.0.0/24 - ./web:/usr/local/tomcat/webapps/ROOT
\ No newline at end of file - ./logs:/logs
- ./upload:/upload
ports:
- "30128:8080"
...@@ -287,7 +287,7 @@ public class UploadFileController extends BaseController { ...@@ -287,7 +287,7 @@ public class UploadFileController extends BaseController {
String CKEditorFuncNum = request.getParameter("CKEditorFuncNum"); String CKEditorFuncNum = request.getParameter("CKEditorFuncNum");
String fileName = request.getContextPath() + uploadFile(request); String fileName = request.getContextPath() + uploadFile(request);
PrintWriter out; 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(" String s = "<script type=\"text/javascript\">window.parent.CKEDITOR.tools.callFunction("
+ CKEditorFuncNum + CKEditorFuncNum
+ ", '" + ", '"
......
...@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516 ...@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516
# hibernate.X # hibernate.X
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
hibernate.show_sql=false hibernate.show_sql=false
hibernate.hbm2ddl.auto=update hibernate.hbm2ddl.auto=none
# oracle|mysql # oracle|mysql
database=mysql database=mysql
...@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u ...@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u
# test server address # test server address
system.visit_url= system.visit_url=
# official server address # official server address
#system.visit_url=http://ccpit-tga.org
#upload File save path #upload File save path
system.uploadFilePath.dev= system.uploadFilePath.dev=
......
...@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516 ...@@ -8,7 +8,7 @@ jdbc.pass=ccpit1516
# hibernate.X # hibernate.X
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
hibernate.show_sql=false hibernate.show_sql=false
hibernate.hbm2ddl.auto=update hibernate.hbm2ddl.auto=none
# oracle|mysql # oracle|mysql
database=mysql database=mysql
...@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u ...@@ -29,7 +29,6 @@ system.name=\u4E2D\u56FD\u8D38\u4FC3\u4F1A\u53F0\u6E2F\u6FB3\u4F01\u4E1A\u670D\u
# test server address # test server address
system.visit_url= system.visit_url=
# official server address # official server address
#system.visit_url=http://ccpit-tga.org
#upload File save path #upload File save path
system.uploadFilePath.dev= system.uploadFilePath.dev=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment