Browse Source

B2B后台管理切换数据库到mysql

hejq 7 years ago
parent
commit
276797ca72

+ 7 - 0
pom.xml

@@ -140,6 +140,13 @@
             <artifactId>ojdbc6</artifactId>
         </dependency>
 
+		<!-- mysql -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.21</version>
+		</dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

+ 3 - 0
src/main/java/com/uas/platform/b2bManage/controller/EnterpriseCotroller.java

@@ -13,6 +13,7 @@ import com.uas.platform.b2bManage.service.UseLogService;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -58,6 +59,8 @@ public class EnterpriseCotroller {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Page<EnterpriseBaseInfo> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
         PageInfo info = new PageInfo(params);
+        Sort sort = new Sort(Sort.Direction.DESC, "enDate");
+        info.setSort(sort);
         if (!StringUtils.isEmpty(keyword)) {
             keyword = keyword.trim();
         }

+ 7 - 5
src/main/java/com/uas/platform/b2bManage/model/EnterpriseBaseInfo.java

@@ -1,9 +1,6 @@
 package com.uas.platform.b2bManage.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,7 +10,12 @@ import java.util.Date;
  * Created by hejq on 2018-04-20.
  */
 @Entity
-@Table(name = "sec$enterprises")
+@Table(name = "sec$enterprises", indexes = {
+        @Index(name = "en_uu_index", columnList = "en_uu"),
+        @Index(name = "en_name_index", columnList = "en_name"),
+        @Index(name = "en_address_index", columnList = "en_address"),
+        @Index(name = "en_businesscode_index", columnList = "en_businesscode")
+})
 public class EnterpriseBaseInfo implements Serializable {
 
     /**

+ 1 - 2
src/main/java/com/uas/platform/b2bManage/model/SecretKeyRecord.java

@@ -22,8 +22,7 @@ public class SecretKeyRecord implements Serializable {
      */
     @Id
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "secretkey_gen")
-    @SequenceGenerator(name = "secretkey_gen", sequenceName = "secretkey_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /**

+ 1 - 2
src/main/java/com/uas/platform/b2bManage/model/UseLog.java

@@ -26,8 +26,7 @@ public class UseLog implements Serializable {
      */
     @Id
     @Column(name = "log_id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$manage_gen")
-    @SequenceGenerator(name = "log$manage_gen", sequenceName = "log$manage_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /**

+ 1 - 2
src/main/java/com/uas/platform/b2bManage/model/User.java

@@ -20,8 +20,7 @@ public class User implements Serializable {
      */
     @Id
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
-    @SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     /**

+ 5 - 5
src/main/resources/conf/jdbc.properties

@@ -1,7 +1,7 @@
-jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
-jdbc.username=platform$b2b
-jdbc.password=select*fromuu
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://10.10.100.18:3306/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+jdbc.username=root
+jdbc.password=select
 jdbc.initialSize=5
 jdbc.maxActive=100
 jdbc.minIdle=5
@@ -19,4 +19,4 @@ jdbc.removeAbandonedTimeout=1800
 manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 manage.jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
 manage.jdbc.username=platformmanager$test
-manage.jdbc.password=select!#%*(
+manage.jdbc.password=select!#%*(

+ 1 - 1
src/main/resources/spring/applicationContext.xml

@@ -71,7 +71,7 @@
         <property name="jpaVendorAdapter">
             <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
                 <property name="generateDdl" value="false" />
-                <property name="databasePlatform" value="org.hibernate.dialect.Oracle10gDialect" />
+                <property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" />
                 <property name="showSql" value="false" />
             </bean>
         </property>