Commit a0cf7ed6 authored by 赵啸非's avatar 赵啸非

调整部分文件

parent 6fadb564
This diff is collapsed.
Subproject commit 2f9c257557cbe5bf2c95ea03354e2e82bb41419f Subproject commit 14d1a991d85f5cdf7314a3377afaa4aabcb80ca1
This diff is collapsed.
...@@ -55,6 +55,7 @@ public class SetupDbServiceImpl implements SetupDbService { ...@@ -55,6 +55,7 @@ public class SetupDbServiceImpl implements SetupDbService {
ScriptUtils.executeSqlScript(connection, er); ScriptUtils.executeSqlScript(connection, er);
} catch (Exception e) { } catch (Exception e) {
log.error("初始化数据库异常", e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
} }
return Rest.ok("初始化数据成功!"); return Rest.ok("初始化数据成功!");
...@@ -104,7 +105,7 @@ public class SetupDbServiceImpl implements SetupDbService { ...@@ -104,7 +105,7 @@ public class SetupDbServiceImpl implements SetupDbService {
// 检查数据库是否已经存在 // 检查数据库是否已经存在
if (!databaseExists(conn, dbName)) { if (!databaseExists(conn, dbName)) {
Statement stmt = conn.createStatement(); Statement stmt = conn.createStatement();
String sql = "CREATE DATABASE " + dbName + " default charset=utf8"; String sql = "CREATE DATABASE `" + dbName + "` default charset=utf8";
stmt.executeUpdate(sql); stmt.executeUpdate(sql);
log.info("成功创建数据库"); log.info("成功创建数据库");
stmt.close(); stmt.close();
......
...@@ -112,8 +112,8 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec ...@@ -112,8 +112,8 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
//todo 执行部署脚本 //todo 执行部署脚本
//RuntimeUtil.exec() //RuntimeUtil.exec()
log.info("执行deploy shell 脚本"); log.info("执行deploy shell 脚本 或者构造文件");
callScript("deploy.sh","4",publicPath+"/bin/"); // callScript("deploy.sh","4",publicPath+"/bin/");
}else if(SystemUtil.getOsInfo().isWindows()){ }else if(SystemUtil.getOsInfo().isWindows()){
//todo //todo
} }
......
>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>
>> appbuild-manager << >> setup-project-manager <<
<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<
\ No newline at end of file
server: server:
port: @profiles.server.port@ port: @profiles.server.port@
servlet: servlet:
context-path: /m context-path: /
spring: spring:
application: application:
name: @project.artifactId@ name: @project.artifactId@
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
<property name="enableExecutorTime" value="true" /> <property name="enableExecutorTime" value="false" />
<property name="showSql" value="true" /> <property name="showSql" value="false" />
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
\ No newline at end of file
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