diff --git a/Ylt/gw-charge/target/gw-charge.jar b/Ylt/gw-charge/target/gw-charge.jar deleted file mode 100644 index 0278c9e..0000000 Binary files a/Ylt/gw-charge/target/gw-charge.jar and /dev/null differ diff --git a/Ylt/gw-charge/target/gw-charge.jar.original b/Ylt/gw-charge/target/gw-charge.jar.original index 1136a38..3315d34 100644 Binary files a/Ylt/gw-charge/target/gw-charge.jar.original and b/Ylt/gw-charge/target/gw-charge.jar.original differ diff --git a/Ylt/ms-user/pom.xml b/Ylt/ms-user/pom.xml index 450a2b6..6f96568 100644 --- a/Ylt/ms-user/pom.xml +++ b/Ylt/ms-user/pom.xml @@ -23,16 +23,7 @@ aliyun-java-sdk-core 4.0.5 - - com.jfinal - jfinal - ${jfinal.version} - - - com.zaxxer - HikariCP - 3.4.5 - + cn.smallbun.screw screw-core diff --git a/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java b/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java deleted file mode 100644 index 20695d5..0000000 --- a/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.charge; - -import com.alibaba.druid.wall.WallFilter; -import com.jfinal.plugin.activerecord.ActiveRecordPlugin; -import com.jfinal.plugin.activerecord.dialect.MysqlDialect; -import com.jfinal.plugin.druid.DruidPlugin; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.io.File; - -@Configuration -public class ActiveRecordPluginConfig { - //通过SpringBoot获取到数据库配置 - @Value("${spring.datasource.username}") - private String username; - - @Value("${spring.datasource.password}") - private String password; - - @Value("${spring.datasource.url}") - private String url; - - @Value("${spring.datasource.driver-class-name}") - private String driverClassName; - - @Bean - public ActiveRecordPlugin initActiveRecordPlugin() { - DruidPlugin druidPlugin = new DruidPlugin(url, username, password, driverClassName); - - // 加强数据库安全 - WallFilter wallFilter = new WallFilter(); - wallFilter.setDbType("mysql"); - druidPlugin.addFilter(wallFilter); - druidPlugin.start(); - - // 配置ActiveRecord插件 - ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin); - arp.setDialect(new MysqlDialect()); - //遍历sql目录下所有的sql文件 - File sqlDir; - String basePath = ActiveRecordPluginConfig.class.getClassLoader().getResource(".").getPath(); - basePath = basePath.replace("/target/test-classes/", "/target/classes/"); - sqlDir = new File(basePath + "/Sql"); - File[] sqlFiles = sqlDir.listFiles(); - for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) { - //只加载.sql文件 - if (sqlFile.getName().indexOf(".sql") > 0) { - arp.addSqlTemplate("/Sql/" + sqlFile.getName()); - } - } - //加载 - arp.start(); - return arp; - } -} \ No newline at end of file diff --git a/Ylt/ms-user/src/main/java/com/charge/tools/GenerateMysqlDoc.java b/Ylt/ms-user/src/main/java/com/charge/tools/GenerateMysqlDoc.java deleted file mode 100644 index a89c8e5..0000000 --- a/Ylt/ms-user/src/main/java/com/charge/tools/GenerateMysqlDoc.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.charge.tools; - -import cn.smallbun.screw.core.Configuration; -import cn.smallbun.screw.core.engine.EngineConfig; -import cn.smallbun.screw.core.engine.EngineFileType; -import cn.smallbun.screw.core.engine.EngineTemplateType; -import cn.smallbun.screw.core.execute.DocumentationExecute; -import cn.smallbun.screw.core.process.ProcessConfig; -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; - -import javax.sql.DataSource; -import java.util.ArrayList; - -public class GenerateMysqlDoc { - public static void main(String[] args) { - String fileOutputDir = "c:\\"; - //数据源 - HikariConfig hikariConfig = new HikariConfig(); - hikariConfig.setDriverClassName("com.mysql.jdbc.Driver"); - hikariConfig.setJdbcUrl("jdbc:mysql://10.10.14.210:22066/yltcharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false"); - hikariConfig.setUsername("root"); - hikariConfig.setPassword("DsideaL147258369"); - //设置可以获取tables remarks信息 - hikariConfig.addDataSourceProperty("useInformationSchema", "true"); - hikariConfig.setMinimumIdle(2); - hikariConfig.setMaximumPoolSize(5); - DataSource dataSource = new HikariDataSource(hikariConfig); - //生成配置 - EngineConfig engineConfig = EngineConfig.builder() - //生成文件路径 - .fileOutputDir(fileOutputDir) - //打开目录 - .openOutputDir(true) - //文件类型 - .fileType(EngineFileType.HTML) - //生成模板实现 - .produceType(EngineTemplateType.freemarker) - //自定义文件名称 - .fileName("驿来特数据库文档").build(); - - //忽略表 - ArrayList ignoreTableName = new ArrayList<>(); - //ignoreTableName.add("test_user"); - //ignoreTableName.add("test_group"); - //忽略表前缀 - ArrayList ignorePrefix = new ArrayList<>(); - //ignorePrefix.add("test_"); - //忽略表后缀 - ArrayList ignoreSuffix = new ArrayList<>(); - //ignoreSuffix.add("_test"); - - ProcessConfig processConfig = ProcessConfig.builder() - //指定生成逻辑、当存在指定表、指定表前缀、指定表后缀时，将生成指定表，其余表不生成、并跳过忽略表配置 - //根据名称指定表生成 - .designatedTableName(new ArrayList<>()) - //根据表前缀生成 - .designatedTablePrefix(new ArrayList<>()) - //根据表后缀生成 - .designatedTableSuffix(new ArrayList<>()) - //忽略表名 - .ignoreTableName(ignoreTableName) - //忽略表前缀 - .ignoreTablePrefix(ignorePrefix) - //忽略表后缀 - .ignoreTableSuffix(ignoreSuffix).build(); - //配置 - Configuration config = Configuration.builder() - //版本 - .version("1.0.0") - //描述 - .description("驿来特数据库设计文档生成") - //数据源 - .dataSource(dataSource) - //生成配置 - .engineConfig(engineConfig) - //生成配置 - .produceConfig(processConfig) - .build(); - //执行生成 - new DocumentationExecute(config).execute(); - } -} diff --git a/Ylt/ms-user/src/main/java/com/charge/user/controller/UserController.java b/Ylt/ms-user/src/main/java/com/charge/user/controller/UserController.java index 2f1bfb8..7fa090f 100644 --- a/Ylt/ms-user/src/main/java/com/charge/user/controller/UserController.java +++ b/Ylt/ms-user/src/main/java/com/charge/user/controller/UserController.java @@ -18,9 +18,6 @@ import com.charge.user.service.impl.AsyncTask; import com.charge.util.CommonUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.jfinal.kit.Kv; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -520,56 +517,5 @@ public class UserController { } return I100cResponse.success(); } - - - /** - * 黄海测试JFinal的应用 - * - * @return - */ - @RequestMapping(value = "/HuangHaiTest") - @ResponseBody - public Kv HuangHaiTest(HttpServletRequest request) { - //String cardNo= request.getParameter("cardNo"); - String sql = "select * from t_car where id=908"; - Record record = Db.findFirst(sql); - Kv kv = Kv.by("success", true); - kv.set("data", record); - return kv; - } - - - @RequestMapping(value = "/HuangHaiTest2") - @ResponseBody - public Kv HuangHaiTest2(HttpServletRequest request) { - List list = new ArrayList<>(); - - Record r1 = new Record(); - r1.set("dictKey", 1); - r1.set("dictValue", "卫生间"); - r1.set("imageUrl", "station-toilet"); - r1.set("id", null); - r1.set("parentId", null); - r1.set("code", null); - r1.set("sort", null); - r1.set("remark", null); - r1.set("isSealed", null); - r1.set("isDeleted", null); - list.add(r1); - - Record r2 = new Record(); - r2.set("dictKey", 1); - r2.set("dictValue", "卫生间"); - r2.set("imageUrl", "station-toilet"); - r2.set("id", null); - r2.set("parentId", null); - r2.set("code", null); - r2.set("sort", null); - r2.set("remark", null); - r2.set("isSealed", null); - r2.set("isDeleted", null); - list.add(r2); - return CommonUtil.getRet(list, true, "获取成功！"); - } } diff --git a/Ylt/ms-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Ylt/ms-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index e9ad60c..69b8530 100644 --- a/Ylt/ms-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/Ylt/ms-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -99,7 +99,6 @@ D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\AssembleAc D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\PopupWindowParam.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\service\impl\ConnectorServiceImp.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\GroundLockStatus.java -D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\ActiveRecordPluginConfig.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\mapper\EquipmentFaultConfigMapper.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\service\AdPagePicService.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\mapper\AwardRecordMapper.java @@ -387,7 +386,6 @@ D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\AppSkin.ja D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\mapper\CarBrandMapper.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\saas\controller\OperatorWalletController.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\User.java -D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\tools\GenerateMysqlDoc.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\entity\AdPage.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\api\UserCarApi.java D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\user\controller\PopupWindowPicController.java diff --git a/Ylt/ms-user/target/ms-user.jar b/Ylt/ms-user/target/ms-user.jar index a48f80d..05260cc 100644 Binary files a/Ylt/ms-user/target/ms-user.jar and b/Ylt/ms-user/target/ms-user.jar differ diff --git a/Ylt/ms-user/target/ms-user.jar.original b/Ylt/ms-user/target/ms-user.jar.original index 48fc300..5cf0495 100644 Binary files a/Ylt/ms-user/target/ms-user.jar.original and b/Ylt/ms-user/target/ms-user.jar.original differ