ibizdev提交

app_web/src/components/app-rich-text-editor/app-rich-text-editor.vue

@@ -157,6 +157,7 @@ export default class AppRichTextEditor extends Vue {
         let richtexteditor = this;
         tinymceCode.init({
             selector: '#' + this.id,
+            width: 'calc( 100% - 2px )',
             height: this.height,
             min_height: 400,
             branding: false,

app_web/src/pages/dict/app-index-view/router.ts

@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import { AuthGuard } from '@/utils';
 import qs from 'qs';
+import { globalRoutes, indexRoutes} from '@/router'
 
 Vue.use(Router);
 
@@ -59,6 +60,7 @@ const router = new Router({
                     },
                     component: () => import('@pages/dict/ibzdict-edit-view/ibzdict-edit-view.vue'),
                 },
+            ...indexRoutes,
             ],
         },
     {
@@ -85,6 +87,7 @@ const router = new Router({
         },
         component: () => import('@pages/dict/ibzdict-edit-view/ibzdict-edit-view.vue'),
     },
+        ...globalRoutes,
         {
             path: '/login/:login?',
             name: 'login',

app_web/src/router/index.ts

+//用户自定义全局路由
+export const globalRoutes:Array<any> = [
+
+];
+//用户自定义首页路由
+export const indexRoutes:Array<any> = [
+
+];

ibzdict-core/src/main/java/cn/ibizlab/core/dict/mapper/IBZDictItemMapper.java

@@ -14,7 +14,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import java.io.Serializable;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-
+import com.alibaba.fastjson.JSONObject;
 
 public interface IBZDictItemMapper extends BaseMapper<IBZDictItem>{
 
@@ -29,6 +29,37 @@ public interface IBZDictItemMapper extends BaseMapper<IBZDictItem>{
     int deleteById(Serializable id);
     Page<IBZDictItem> selectPermission(IPage page,@Param("pw") Wrapper<IBZDictItem> wrapper) ;
 
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql);
 
     List<IBZDictItem> selectByDictid(@Param("dictid") Serializable dictid) ;
 

ibzdict-core/src/main/java/cn/ibizlab/core/dict/mapper/IBZDictMapper.java

@@ -14,7 +14,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import java.io.Serializable;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-
+import com.alibaba.fastjson.JSONObject;
 
 public interface IBZDictMapper extends BaseMapper<IBZDict>{
 
@@ -29,5 +29,36 @@ public interface IBZDictMapper extends BaseMapper<IBZDict>{
     int deleteById(Serializable id);
     Page<IBZDict> selectPermission(IPage page,@Param("pw") Wrapper<IBZDict> wrapper) ;
 
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql);
 
 }

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/IIBZDictItemService.java

@@ -11,6 +11,7 @@ import java.math.BigInteger;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import com.alibaba.fastjson.JSONObject;
 
 import cn.ibizlab.core.dict.domain.IBZDictItem;
 import cn.ibizlab.core.dict.filter.IBZDictItemSearchContext;
@@ -42,6 +43,9 @@ public interface IIBZDictItemService extends IService<IBZDictItem>{
 
 
 
+    List<JSONObject> select(String sql);
+    boolean execute(String sql);
+
 }
 
 

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/IIBZDictService.java

@@ -11,6 +11,7 @@ import java.math.BigInteger;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import com.alibaba.fastjson.JSONObject;
 
 import cn.ibizlab.core.dict.domain.IBZDict;
 import cn.ibizlab.core.dict.filter.IBZDictSearchContext;
@@ -38,6 +39,9 @@ public interface IIBZDictService extends IService<IBZDict>{
 
 
 
+    List<JSONObject> select(String sql);
+    boolean execute(String sql);
+
 }
 
 

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/IBZDictItemServiceImpl.java

@@ -32,7 +32,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.ibizlab.core.dict.mapper.IBZDictItemMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-
+import com.alibaba.fastjson.JSONObject;
 
 
 /**
@@ -183,6 +183,30 @@ public class IBZDictItemServiceImpl extends ServiceImpl<IBZDictItemMapper, IBZDi
     }
 
 
+    @Override
+    public List<JSONObject> select(String sql){
+        return this.baseMapper.selectBySQL(sql);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
 }
 
 

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/IBZDictServiceImpl.java

@@ -32,7 +32,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.ibizlab.core.dict.mapper.IBZDictMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-
+import com.alibaba.fastjson.JSONObject;
 
 
 /**
@@ -151,6 +151,30 @@ public class IBZDictServiceImpl extends ServiceImpl<IBZDictMapper, IBZDict> impl
     }
 
 
+    @Override
+    public List<JSONObject> select(String sql){
+        return this.baseMapper.selectBySQL(sql);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
 }
 
 

ibzdict-core/src/main/resources/liquibase/config/init_h2.sql

 
-create schema if not exists a_A_5ae9eb39a;
-set schema a_A_5ae9eb39a;
+create schema if not exists a_A_5d9d78509;
+set schema a_A_5d9d78509;
 
 
 

ibzdict-core/src/main/resources/liquibase/h2_table.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[IBZDICT]数据结构 -->
-    <changeSet author="a_A_5ae9eb39a" id="tab-ibzdict-42-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdict-42-1">
         <createTable tableName="IBZDICT">
                 <column name="IBZDICTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDICT_IBZDICTID"/>
@@ -24,7 +24,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDICTITEM]数据结构 -->
-    <changeSet author="a_A_5ae9eb39a" id="tab-ibzdictitem-73-2">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdictitem-73-2">
         <createTable tableName="IBZDICTITEM">
                 <column name="IBZDICTITEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDICTITEM_IBZDICTITEMID"/>
@@ -58,7 +58,7 @@
 
         <!--输出实体[IBZDICT]外键关系 -->
         <!--输出实体[IBZDICTITEM]外键关系 -->
-    <changeSet author="a_A_5ae9eb39a" id="fk-ibzdictitem-73-3">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdictitem-73-3">
        <addForeignKeyConstraint baseColumnNames="DICTID" baseTableName="IBZDICTITEM" constraintName="DER1N_IBZDICTITEM_IBZDICT_DICT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBZDICTID" referencedTableName="IBZDICT" validate="true"/>
     </changeSet>
 

ibzdict-util/src/main/resources/application-sys.yml

@@ -5,9 +5,9 @@ spring:
       discovery:
         server-addr: 172.16.102.211:8848
   datasource:
-    password: 'E6@8@7ce'
-    username: a_A_5ae9eb39a
-    url: jdbc:mysql://172.16.180.232:3306/a_A_5ae9eb39a?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    password: '@6dEfb3@'
+    username: a_A_5d9d78509
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大
@@ -28,7 +28,7 @@ spring:
     pool-prepared-statements: false
     max-pool-prepared-statement-per-connection-size: 20
     isSyncDBSchema: false
-    defaultSchema: a_A_5ae9eb39a
+    defaultSchema: a_A_5d9d78509
     conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置