test:()修改企业添加
parent
88fdcfcbab
commit
40fccdbc56
|
@ -6,7 +6,6 @@ import com.muyu.common.core.constant.SecurityConstants;
|
||||||
import com.muyu.common.core.domain.Result;
|
import com.muyu.common.core.domain.Result;
|
||||||
import com.muyu.common.domain.Enterprise;
|
import com.muyu.common.domain.Enterprise;
|
||||||
import com.muyu.common.system.domain.Business;
|
import com.muyu.common.system.domain.Business;
|
||||||
import com.muyu.common.system.domain.SysUser;
|
|
||||||
import com.muyu.common.system.remote.RemoteUserService;
|
import com.muyu.common.system.remote.RemoteUserService;
|
||||||
import com.muyu.common.util.PageUtils;
|
import com.muyu.common.util.PageUtils;
|
||||||
import com.muyu.server.controller.form.DeleteEnterpriseByIds;
|
import com.muyu.server.controller.form.DeleteEnterpriseByIds;
|
||||||
|
@ -28,7 +27,6 @@ import java.sql.Connection;
|
||||||
import java.sql.DriverManager;
|
import java.sql.DriverManager;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -97,14 +95,8 @@ public class EnterpriseController {
|
||||||
business.setDatabaseName(form.getEnterpriseDatabaseName());
|
business.setDatabaseName(form.getEnterpriseDatabaseName());
|
||||||
remoteUserService.settlementEnterpriseInfo(business, SecurityConstants.INNER);
|
remoteUserService.settlementEnterpriseInfo(business, SecurityConstants.INNER);
|
||||||
|
|
||||||
SysUser sysUser = new SysUser();
|
|
||||||
sysUser.setDatabaseName(form.getEnterpriseDatabaseName());
|
|
||||||
sysUser.setUserName(form.getEnterpriseName());
|
|
||||||
sysUser.setCreateTime(new Date());
|
|
||||||
remoteUserService.addUser(sysUser, SecurityConstants.INNER);
|
|
||||||
String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
|
String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
|
||||||
String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + form.getEnterpriseDatabaseName() + ";";
|
String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + form.getEnterpriseDatabaseName() + ";";
|
||||||
|
|
||||||
try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD);
|
try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD);
|
||||||
Statement stmt = adminConn.createStatement()) {
|
Statement stmt = adminConn.createStatement()) {
|
||||||
|
|
||||||
|
@ -130,8 +122,6 @@ public class EnterpriseController {
|
||||||
ClassPathResource rc = new ClassPathResource("static/saas.sql");
|
ClassPathResource rc = new ClassPathResource("static/saas.sql");
|
||||||
EncodedResource er = new EncodedResource(rc, "utf-8");
|
EncodedResource er = new EncodedResource(rc, "utf-8");
|
||||||
ScriptUtils.executeSqlScript(connection, er);
|
ScriptUtils.executeSqlScript(connection, er);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (SQLException e) {
|
} catch (SQLException e) {
|
||||||
|
|
Loading…
Reference in New Issue