android

dtok-api/.idea/dataSources.xml

@@ -6,6 +6,11 @@
       <synchronize>true</synchronize>
       <jdbc-driver>jdbc.RedisDriver</jdbc-driver>
       <jdbc-url>jdbc:redis://r-2ze1p354xrfsdettwkpd.tairpena.rds.aliyuncs.com:6379/0</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
     <data-source source="LOCAL" name="dtok@rm-uf67t3vw28yp475tf1o.mysql.rds.aliyuncs.com" uuid="1599cdd0-c2b1-471d-bc7e-9dc5f424bb70">
@@ -13,6 +18,11 @@
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
       <jdbc-url>jdbc:mysql://rm-uf67t3vw28yp475tf1o.mysql.rds.aliyuncs.com:3306/dtok?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true&amp;failOverReadOnly=false&amp;useSSL=false&amp;serverTimezone=GMT%2B8</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

dtok-api/.idea/jarRepositories.xml

@@ -16,6 +16,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="public" />
       <option name="name" value="aliyun nexus" />

dtok-api/api/src/main/java/com/dtok/api/AppApi.java

@@ -163,12 +163,15 @@ public class AppApi {
             throw new NullPointerException("没找到设备");
         }
         Account account = (Account) StpUtil.getSession().get("loginUser");
-        if (!account.getId().equals(devices.getAccount())) {
-            throw new AuthenticateException(403, "不是你的设备");
+        if (!account.getIsSuper()) {
+            if (!account.getId().equals(devices.getAccount())) {
+                throw new AuthenticateException(403, "不是你的设备");
+            }
         }
         devicesRepository.deleteDevicesByUuid(id);
         return ResponseData.success("解绑完成");
     }
+
     @PostMapping("/addCommonItem")
     public ResponseData addCommonItem(@RequestParam(defaultValue = "com.ss.android.ugc.aweme", required = false,
             value = "app") String app, @RequestParam("type") String type, @RequestParam("content") String content) {

dtok-api/api/src/main/java/com/dtok/api/controller/DeviceController.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Predicate;
 import java.util.Date;
 import java.util.List;
@@ -35,14 +36,17 @@ public class DeviceController {
     @Autowired
     AccountRepository accountRepository;
 
-    @PostMapping("/search")
-    public ResponseData search() {
+    @GetMapping("/search")
+    public ResponseData search(@RequestParam(value = "userId", required = false) Integer userId) {
         Specification<Devices> query = (root, query1, criteriaBuilder) -> {
-
             Predicate predicate = criteriaBuilder.conjunction();
             Account account = ((Account) StpUtil.getSession().get("loginUser"));
             if (!account.getIsSuper()) {
                 predicate.getExpressions().add(criteriaBuilder.or(criteriaBuilder.equal(root.get("account"), account.getId())));
+                return predicate;
+            }
+            if (!Objects.isNull(userId)) {
+                predicate.getExpressions().add(criteriaBuilder.and(criteriaBuilder.equal(root.get("account"), userId)));
             }
             return predicate;
         };
@@ -50,6 +54,4 @@ public class DeviceController {
         return ResponseData.success(result);
     }
 
-
-
 }

dtok-api/api/src/main/java/com/dtok/api/controller/ScriptController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.persistence.Transient;
+import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import java.io.File;
 import java.io.IOException;
@@ -62,6 +63,8 @@ public class ScriptController extends BaseController {
             if (ToolUtil.isNotEmpty(module)) {
                 predicate.getExpressions().add(criteriaBuilder.or(criteriaBuilder.like(root.get("module"), module)));
             }
+            Order weightOrder = criteriaBuilder.desc(root.get("groupName"));
+            query1.orderBy(weightOrder);
             return predicate;
         };
         List<Script> result = scriptRepository.findAll(query);

dtok-api/entity/src/main/java/com/dtok/entity/Devices.java

@@ -1,9 +1,6 @@
 package com.dtok.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.AllArgsConstructor;
@@ -93,6 +90,10 @@ OFFLINE 离线
 	private String lastConnectionIp;
 
 
+	@OneToOne
+	@JoinColumn(name = "account", referencedColumnName = "id", insertable = false, updatable = false)
+	private Account accountObj;
+
 
 	/**
 	 * 最后登录IP

dtok-api/entity/target/maven-archiver/pom.properties

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Sun Feb 12 10:26:00 CST 2023
-version=0.1
-groupId=com.ciemis
 artifactId=entity
+groupId=com.dtok
+version=0.1

dtok-api/entity/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,25 +1,16 @@
-com\ciemis\entity\postgres\OpcImData.class
-com\ciemis\entity\Role.class
-com\ciemis\entity\BaseCraftProcess.class
-com\ciemis\entity\Permission.class
-com\ciemis\entity\param\BaseMachineForm.class
-com\ciemis\entity\UserCompany.class
-com\ciemis\entity\MqAccount.class
-com\ciemis\entity\ChartUser.class
-com\ciemis\entity\postgres\OpcImWarningRecord.class
-com\ciemis\entity\MqAccountUpdate.class
-com\ciemis\entity\RolePermission.class
-com\ciemis\entity\Company.class
-com\ciemis\entity\Dict.class
-com\ciemis\entity\param\PermissionNode.class
-com\ciemis\entity\param\CompanyUserBalance.class
-com\ciemis\entity\ChartCompany.class
-com\ciemis\entity\param\ChartParam.class
-com\ciemis\entity\MqPermission.class
-com\ciemis\entity\BaseMachine.class
-com\ciemis\entity\Gateway.class
-com\ciemis\entity\User.class
-com\ciemis\entity\BaseChartSocketMapping.class
-com\ciemis\entity\BaseCraft.class
-com\ciemis\entity\param\KanbanNodeParent.class
-com\ciemis\entity\Chart.class
+com\dtok\entity\params\ScriptFormData.class
+com\dtok\entity\RolePermission.class
+com\dtok\entity\Script.class
+com\dtok\entity\CommonItem.class
+com\dtok\entity\jedisvo\LoginItem.class
+com\dtok\entity\LoginHistory.class
+com\dtok\entity\AccountRole.class
+com\dtok\entity\params\DeviceLoginResponse.class
+com\dtok\entity\Permission.class
+com\dtok\entity\params\UserResponse.class
+com\dtok\entity\emum\LOGIN_DEVICE.class
+com\dtok\entity\AppInfo.class
+com\dtok\entity\Devices.class
+com\dtok\entity\ScriptHistory.class
+com\dtok\entity\Account.class
+com\dtok\entity\params\PermissionNode.class

dtok-api/entity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,25 +1,16 @@
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\MqAccountUpdate.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Dict.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\param\KanbanNodeParent.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Role.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\User.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Gateway.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\BaseChartSocketMapping.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Permission.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\param\BaseMachineForm.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\postgres\OpcImData.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\MqPermission.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\MqAccount.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\RolePermission.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Company.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\param\CompanyUserBalance.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\UserCompany.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\Chart.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\param\ChartParam.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\BaseCraft.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\postgres\OpcImWarningRecord.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\BaseCraftProcess.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\ChartCompany.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\param\PermissionNode.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\ChartUser.java
-E:\Project\He3\MI\MI\ciemis-mi-api\entity\src\main\java\com\ciemis\entity\BaseMachine.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\AccountRole.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\emum\LOGIN_DEVICE.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\AppInfo.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\params\UserResponse.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\Script.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\ScriptHistory.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\params\DeviceLoginResponse.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\Account.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\params\PermissionNode.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\Devices.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\jedisvo\LoginItem.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\params\ScriptFormData.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\LoginHistory.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\Permission.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\RolePermission.java
+D:\Project\DTok\dtok-api\entity\src\main\java\com\dtok\entity\CommonItem.java

dtok-api/framework/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=9090
+server.port=8888
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://rm-uf67t3vw28yp475tf1o.mysql.rds.aliyuncs.com:3306/dtok?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=GMT%2B8
 spring.datasource.username=yangchaojie
@@ -17,7 +17,7 @@ sa-token.token-style=uuid
 sa-token.is-log=true
 logging.config=classpath:log4j2-spring.xml
 logging.level.com.dtok.repository:trace
-file.tempDir=D:\\MyProject\\DTok
+file.tempDir=/opt/dtok/files
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=Asia/Shanghai

dtok-api/framework/target/classes/application.properties

@@ -1,4 +1,4 @@
-server.port=9090
+server.port=8888
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://rm-uf67t3vw28yp475tf1o.mysql.rds.aliyuncs.com:3306/dtok?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=GMT%2B8
 spring.datasource.username=yangchaojie
@@ -17,7 +17,7 @@ sa-token.token-style=uuid
 sa-token.is-log=true
 logging.config=classpath:log4j2-spring.xml
 logging.level.com.dtok.repository:trace
-file.tempDir=E:\\MyProject\\DTok
+file.tempDir=/opt/dtok/files
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=Asia/Shanghai

dtok-api/framework/target/maven-archiver/pom.properties

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Sun Feb 12 10:26:06 CST 2023
-version=0.1
-groupId=com.ciemis
 artifactId=framework
+groupId=com.dtok
+version=0.1

dtok-api/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,45 +1,39 @@
-com\ciemis\framework\util\HttpContext.class
-com\ciemis\framework\core\PostgresqlSourceManager.class
-com\ciemis\framework\util\Tools$1.class
-com\ciemis\framework\aop\CompanyHandlerMethodArgumentResolver.class
-com\ciemis\framework\configure\ServerConfig.class
-com\ciemis\framework\exception\CoreExceptionEnum.class
-com\ciemis\framework\response\ErrorResponseData.class
-META-INF\spring-configuration-metadata.json
-com\ciemis\framework\util\ToolUtil.class
-com\ciemis\framework\response\ResponseData.class
-com\ciemis\framework\sql\SqlServerDialect.class
-com\ciemis\framework\exception\ServiceException.class
-com\ciemis\framework\http\OkHttpUtil.class
-com\ciemis\framework\util\IpUtil.class
-com\ciemis\framework\aop\GlobalExceptionHandler.class
-com\ciemis\framework\aop\CompanyInject.class
-com\ciemis\framework\listener\MySaTokenListener.class
-com\ciemis\framework\util\RedisConstants.class
-com\ciemis\framework\exception\AuthenticateException.class
-com\ciemis\framework\properties\AliyunMqProperties.class
-com\ciemis\framework\util\Tools.class
-com\ciemis\framework\authenticate\StpInterfaceImpl.class
-com\ciemis\framework\response\param\UserSearchResponse.class
-com\ciemis\framework\util\SerializeUtil.class
-com\ciemis\framework\configure\WebConfigurer.class
-com\ciemis\framework\util\OssClient.class
-com\ciemis\framework\exception\ConnectionAlreadyExist.class
-com\ciemis\framework\exception\BizExceptionEnum.class
-com\ciemis\framework\util\ValidateUtil.class
-com\ciemis\framework\base\BaseController.class
-com\ciemis\framework\util\RedisUtil.class
-com\ciemis\framework\configure\SwaggerConfig.class
-com\ciemis\framework\exception\AbstractBaseExceptionEnum.class
-com\ciemis\framework\configure\RedisConfig.class
-com\ciemis\framework\util\FileUtils.class
-com\ciemis\framework\response\param\UserResponse.class
-com\ciemis\framework\response\SuccessResponseData.class
-com\ciemis\framework\exception\BusinessException.class
-com\ciemis\framework\sql\UpperTableStrategy.class
-com\ciemis\framework\properties\AliyunOSSProperties.class
-com\ciemis\framework\util\RenderUtil.class
-com\ciemis\framework\util\StateParameter.class
-com\ciemis\framework\util\UploadUtils.class
-com\ciemis\framework\http\LoggingInterceptor.class
-com\ciemis\framework\util\MD5Util.class
+com\dtok\framework\util\RedisUtil.class
+com\dtok\framework\util\Tools$1.class
+com\dtok\framework\util\ValidateUtil.class
+com\dtok\framework\http\OkHttpUtil.class
+com\dtok\framework\exception\BusinessException.class
+com\dtok\framework\util\HttpContext.class
+com\dtok\framework\util\RedisConstants.class
+com\dtok\framework\configure\RedisConfig.class
+com\dtok\framework\http\LoggingInterceptor.class
+com\dtok\framework\util\UploadUtils.class
+com\dtok\framework\exception\ServiceException.class
+com\dtok\framework\response\ErrorResponseData.class
+com\dtok\framework\listener\MySaTokenListener.class
+com\dtok\framework\util\RenderUtil.class
+com\dtok\framework\aop\GlobalExceptionHandler.class
+com\dtok\framework\configure\SaTokenConfigure.class
+com\dtok\framework\util\MD5Util.class
+com\dtok\framework\util\ToolUtil.class
+com\dtok\framework\exception\ConnectionAlreadyExist.class
+com\dtok\framework\util\FileUtils.class
+com\dtok\framework\exception\AbstractBaseExceptionEnum.class
+com\dtok\framework\configure\WebConfigurer.class
+com\dtok\framework\base\BaseController.class
+com\dtok\framework\sql\SqlServerDialect.class
+com\dtok\framework\util\IpUtil.class
+com\dtok\framework\response\ResponseData.class
+com\dtok\framework\configure\SwaggerConfig.class
+com\dtok\framework\exception\AuthenticateException.class
+com\dtok\framework\exception\BizExceptionEnum.class
+com\dtok\framework\util\PasswordUtil.class
+com\dtok\framework\util\StateParameter.class
+com\dtok\framework\exception\CoreExceptionEnum.class
+com\dtok\framework\util\SerializeUtil.class
+com\dtok\framework\response\SuccessResponseData.class
+com\dtok\framework\sql\UpperTableStrategy.class
+com\dtok\framework\util\Tools.class
+com\dtok\framework\configure\WebSocketConfig.class
+com\dtok\framework\configure\ServerConfig.class
+com\dtok\framework\authenticate\StpInterfaceImpl.class

dtok-api/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,46 +1,39 @@
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\ConnectionAlreadyExist.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\ServiceException.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\HttpContext.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\configure\WebConfigurer.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\AuthenticateException.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\BusinessException.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\ToolUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\response\param\UserSearchResponse.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\core\PostgresqlSourceManager.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\OssClient.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\ConnectionOptionWrapper.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\StateParameter.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\configure\ServerConfig.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\listener\MySaTokenListener.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\properties\AliyunMqProperties.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\configure\SwaggerConfig.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\response\ErrorResponseData.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\http\OkHttpUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\response\ResponseData.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\sql\SqlServerDialect.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\RenderUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\UploadUtils.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\aop\GlobalExceptionHandler.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\configure\SaTokenConfigure.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\core\DataSourceManager.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\FileUtils.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\base\BaseController.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\aop\CompanyInject.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\response\SuccessResponseData.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\CoreExceptionEnum.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\sql\UpperTableStrategy.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\SerializeUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\ValidateUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\MD5Util.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\AbstractBaseExceptionEnum.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\IpUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\Tools.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\authenticate\StpInterfaceImpl.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\properties\AliyunOSSProperties.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\aop\CompanyHandlerMethodArgumentResolver.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\response\param\UserResponse.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\RedisConstants.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\configure\RedisConfig.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\util\RedisUtil.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\exception\BizExceptionEnum.java
-E:\Project\He3\MI\MI\ciemis-mi-api\framework\src\main\java\com\ciemis\framework\http\LoggingInterceptor.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\SaTokenConfigure.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\sql\UpperTableStrategy.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\FileUtils.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\http\OkHttpUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\MD5Util.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\WebSocketConfig.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\BusinessException.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\aop\GlobalExceptionHandler.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\HttpContext.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\IpUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\http\LoggingInterceptor.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\response\ResponseData.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\AbstractBaseExceptionEnum.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\StateParameter.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\BizExceptionEnum.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\RenderUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\ServerConfig.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\AuthenticateException.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\sql\SqlServerDialect.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\base\BaseController.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\SerializeUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\ConnectionOptionWrapper.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\RedisUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\WebConfigurer.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\UploadUtils.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\response\SuccessResponseData.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\PasswordUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\ServiceException.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\ToolUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\CoreExceptionEnum.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\RedisConfig.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\RedisConstants.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\configure\SwaggerConfig.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\ValidateUtil.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\listener\MySaTokenListener.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\authenticate\StpInterfaceImpl.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\exception\ConnectionAlreadyExist.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\response\ErrorResponseData.java
+D:\Project\DTok\dtok-api\framework\src\main\java\com\dtok\framework\util\Tools.java

dtok-api/pom.xml

@@ -443,30 +443,30 @@
 
     </dependencies>
     <!--Maven远程仓库设置 非必要，可以删除-->
-<!--    <repositories>-->
-<!--        <repository>-->
-<!--            <id>public</id>-->
-<!--            <name>aliyun nexus</name>-->
-<!--            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
-<!--            <releases>-->
-<!--                <enabled>true</enabled>-->
-<!--            </releases>-->
-<!--        </repository>-->
-<!--    </repositories>-->
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
 
     <!--Maven远程插件库设置 非必要，可以删除-->
-<!--    <pluginRepositories>-->
-<!--        <pluginRepository>-->
-<!--            <id>public</id>-->
-<!--            <name>aliyun nexus</name>-->
-<!--            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
-<!--            <releases>-->
-<!--                <enabled>true</enabled>-->
-<!--            </releases>-->
-<!--            <snapshots>-->
-<!--                <enabled>false</enabled>-->
-<!--            </snapshots>-->
-<!--        </pluginRepository>-->
-<!--    </pluginRepositories>-->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 
 </project>

dtok-api/repository/target/maven-archiver/pom.properties

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Sun Feb 12 10:26:02 CST 2023
-version=0.1
-groupId=com.ciemis
 artifactId=repository
+groupId=com.dtok
+version=0.1

dtok-api/repository/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,17 +1,10 @@
-com\ciemis\repository\RolePermissionRepository.class
-com\ciemis\repository\CraftProcessRepository.class
-com\ciemis\repository\CraftRepository.class
-com\ciemis\repository\MachineRepository.class
-com\ciemis\repository\MqAccountRepository.class
-com\ciemis\repository\UserCompanyRepository.class
-com\ciemis\repository\GatewayRepository.class
-com\ciemis\repository\ChartUserRepository.class
-com\ciemis\repository\MqPermissionRepository.class
-com\ciemis\repository\ChartCompanyRepository.class
-com\ciemis\repository\ChartSocketMappingRepository.class
-com\ciemis\repository\PermissionRepository.class
-com\ciemis\repository\UserRepository.class
-com\ciemis\repository\ChartRepository.class
-com\ciemis\repository\DictRepository.class
-com\ciemis\repository\CompanyRepository.class
-com\ciemis\repository\RoleRepository.class
+com\dtok\repository\DevicesRepository.class
+com\dtok\repository\RolePermissionRepository.class
+com\dtok\repository\CommonItemRepository.class
+com\dtok\repository\AccountRoleRepository.class
+com\dtok\repository\ScriptHistoryRepository.class
+com\dtok\repository\LoginHistoryRepository.class
+com\dtok\repository\PermissionRepository.class
+com\dtok\repository\AppInfoRepository.class
+com\dtok\repository\AccountRepository.class
+com\dtok\repository\ScriptRepository.class

dtok-api/repository/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,17 +1,10 @@
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\CraftRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\ChartCompanyRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\PermissionRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\MqAccountRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\DictRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\ChartSocketMappingRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\GatewayRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\UserCompanyRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\RoleRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\CraftProcessRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\MqPermissionRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\MachineRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\CompanyRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\RolePermissionRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\ChartRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\ChartUserRepository.java
-E:\Project\He3\MI\MI\ciemis-mi-api\repository\src\main\java\com\ciemis\repository\UserRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\AccountRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\ScriptRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\CommonItemRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\RolePermissionRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\AccountRoleRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\AppInfoRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\DevicesRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\LoginHistoryRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\PermissionRepository.java
+D:\Project\DTok\dtok-api\repository\src\main\java\com\dtok\repository\ScriptHistoryRepository.java

dtok-api/service/target/maven-archiver/pom.properties

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Sun Feb 12 10:26:08 CST 2023
-version=0.1
-groupId=com.ciemis
 artifactId=service
+groupId=com.dtok
+version=0.1

dtok-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,8 +1,2 @@
-com\ciemis\service\impl\PermissionImpl.class
-com\ciemis\service\impl\UserCompanyImpl.class
-com\ciemis\service\impl\PostgresqlService.class
-com\ciemis\service\UserCompanyService.class
-com\ciemis\service\PermissionService.class
-com\ciemis\service\UrlService.class
-com\ciemis\service\impl\UrlServiceImpl.class
-com\ciemis\service\PostgresqlService.class
+com\dtok\service\impl\PermissionImpl.class
+com\dtok\service\PermissionService.class

dtok-api/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,8 +1,2 @@
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\impl\PostgresqlService.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\impl\PermissionImpl.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\PermissionService.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\impl\UrlServiceImpl.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\UrlService.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\impl\UserCompanyImpl.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\PostgresqlService.java
-E:\Project\He3\MI\MI\ciemis-mi-api\service\src\main\java\com\ciemis\service\UserCompanyService.java
+D:\Project\DTok\dtok-api\service\src\main\java\com\dtok\service\impl\PermissionImpl.java
+D:\Project\DTok\dtok-api\service\src\main\java\com\dtok\service\PermissionService.java

dtok-mobile/src/components/PLJL.vue

@@ -148,6 +148,8 @@ export default {
       if ('registerInfo' in localStorage) {
         // eslint-disable-next-line no-unused-vars
         let uuid = JSON.parse(localStorage.getItem('registerInfo')).uuid
+        let hs = JSON.parse(localStorage.getItem('commonItems'))
+
         this.znzf.plhs = hs[this.selectItemName].map((item) => {
           return item.content
         })

dtok-mobile/vue.config.js

@@ -25,7 +25,7 @@ module.exports = defineConfig({
         host: "0.0.0.0",
         proxy: {
             '/api': {
-                target: 'http://192.168.2.28:9090', //后期可以改
+                target: 'https://api.ruanjian168.cc', //后期可以改
                 changeOrigin: true,
                 logLevel: 'debug',
                 pathRewrite: {

dtok-vue/package-lock.json

@@ -2285,6 +2285,17 @@
             "color-convert": "^2.0.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "cliui": {
           "version": "6.0.0",
           "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880033053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz",
@@ -2322,12 +2333,31 @@
             "universalify": "^0.1.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
           "dev": true
         },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1621364735533&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -2348,6 +2378,28 @@
             "strip-ansi": "^6.0.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
@@ -16216,87 +16268,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",

dtok-vue/package.json

@@ -51,7 +51,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.2.2",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.14.0",
     "sass": "~1.32.0",
     "sass-loader": "^10.0.0",
     "vue-cli-plugin-vuetify": "~2.4.2",

dtok-vue/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="https://www.ciemis.com/favicon.ico">
-    <title>CIEMIS MI System</title>
+    <title>DTOK(DMS)</title>
   </head>
   <body>
     <noscript>

dtok-vue/src/components/dialog/CommonForm.vue

@@ -342,6 +342,11 @@ export default {
           ref.reset()
         })
       }
+      if ('uploadRef' in this.$refs) {
+        this.$refs.uploadRef.forEach((ref) => {
+          ref.reset()
+        })
+      }
       if (this.isHaveSelect) {
       }
     },
@@ -387,6 +392,7 @@ export default {
             console.log(resp)
             this.close()
             this.$emit('done')
+            this.reset()
           })
           .catch((resp) => {
 

dtok-vue/src/data/system/device/Device.js

@@ -0,0 +1,23 @@
+export default {
+  queryModel: [
+    {
+      name: '用户',
+      code: 'username',
+      value: '',
+      formType: 'autocomplete',
+      loading: false,
+      searchText: null,
+      selectText: 'username',
+      selectValue: 'id',
+      icon: 'mdi-android',
+      requestModel: {
+        url: '/user/search',
+        params: {
+          code: '',
+          name: ''
+        },
+        methods: 'get'
+      }
+    }
+  ]
+}

dtok-vue/src/locale/en.js

@@ -24,7 +24,8 @@ export default {
     data_init: 'BaseData Init',
     loginHistory: 'LoginHistory',
     script: 'Script',
-    commonItem: 'CommonItem'
+    commonItem: 'CommonItem',
+    device: 'Device'
   },
   login: {
     username: 'username',

dtok-vue/src/locale/zh-Hans.js

@@ -21,7 +21,8 @@ export default {
     craft_process: '模具标准值',
     loginHistory: '登录历史',
     script: '脚本管理',
-    commonItem: '通用数据'
+    commonItem: '通用数据',
+    device: '设备管理'
   },
   login: {
     username: '用户名',

dtok-vue/src/router/config.js

@@ -111,6 +111,15 @@ export const publicRoute = [
           icon: 'mdi-machine'
         },
         component: () => import('../views/base/CommonItem.vue')
+      },
+      {
+        path: '/base/device',
+        name: 'device',
+        meta: {
+          title: 'device',
+          icon: 'mdi-devices'
+        },
+        component: () => import('../views/base/Device.vue')
       }
     ]
   },

dtok-vue/src/views/About.vue

@@ -1,5 +0,0 @@
-<template>
-  <div class="about">
-    <h1>This is an about page</h1>
-  </div>
-</template>

dtok-vue/src/views/Charts.vue

@@ -1,88 +0,0 @@
-<template>
-  <v-app id="inspire">
-    <v-app-bar color="primary" dark dense
-               app
-    >
-      <v-btn
-        icon
-        class="hidden-xs-only" @click="$router.replace('/')"
-      >
-        <v-icon>mdi-arrow-left</v-icon>
-      </v-btn>
-      <v-toolbar-title>{{ this.$store.getters.getCompanyName }}</v-toolbar-title>
-
-      <v-spacer></v-spacer>
-
-      <!--      <v-btn icon>-->
-      <!--        <v-icon>mdi-dots-vertical</v-icon>-->
-      <!--      </v-btn>-->
-    </v-app-bar>
-
-    <v-main>
-      <v-container fluid>
-        <v-row>
-          <v-col
-            v-for="(item,i) in charts"
-            :key="i"
-            cols="4"
-          >
-            <v-hover v-slot="{ hover }">
-              <v-card :to="item.path+'?refreshInv='+item.refreshInterval" :elevation="hover ? 12 : 2"
-                      :class="{ 'on-hover': hover }" tile height="280">
-                <v-card-title>{{ item.name }}</v-card-title>
-                <v-divider/>
-                <v-card-text style="padding: 0;">
-                  <img style="height: auto;width: 100%" alt=""
-                       :src="'https://bi.ciemis.com/api/api/static/'+item.previewImg"/>
-                </v-card-text>
-              </v-card>
-            </v-hover>
-          </v-col>
-        </v-row>
-      </v-container>
-    </v-main>
-  </v-app>
-</template>
-
-<script>
-import request from '../axios/request'
-
-export default {
-  name: 'Charts',
-  data: () => ({
-    charts: [],
-    transparent: 'rgba(255, 255, 255, 0)'
-  }),
-  created () {
-    this.getCharts()
-  },
-  methods: {
-    getCharts () {
-      request({
-        url: '/charts/getCharts?type=' + this.$route.query.type,
-        method: 'get'
-      })
-        .then((resp) => {
-          this.charts = resp.data
-          this.charts.map((item) => {
-            return item
-          })
-        })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.v-card {
-  transition: opacity .4s ease-in-out;
-}
-
-.v-card:not(.on-hover) {
-  opacity: 0.6;
-}
-
-.show-btns {
-  color: rgba(255, 255, 255, 1) !important;
-}
-</style>

dtok-vue/src/views/base/CommonItem.vue

@@ -40,6 +40,7 @@
         :items="desserts"
         loading-text="加载中..."
         :loading="loading"
+        :items-per-page="50"
         class="elevation-1"
       >
         <template v-slot:item.app="{ item }">

dtok-vue/src/views/base/Device.vue

@@ -0,0 +1,199 @@
+<template>
+  <v-container fluid>
+    <CommonQueryCard :query-model="queryModel" v-on:searchDone="search" :col="4"></CommonQueryCard>
+
+    <v-card style="margin-top: 15px" tile>
+      <v-card-title>设备
+        <v-spacer></v-spacer>
+        <!--        <v-btn @click="addOpen" elevation="0" tile dark color="primary" class="mr-2">-->
+        <!--          <v-icon left>-->
+        <!--            mdi-plus-->
+        <!--          </v-icon>-->
+        <!--          新增-->
+        <!--        </v-btn>-->
+        <v-btn icon slot="widget-header-action" @click="search(null)">
+          <v-icon class="text--secondary">mdi-refresh</v-icon>
+        </v-btn>
+      </v-card-title>
+      <v-divider/>
+      <v-data-table
+        :headers="headers"
+        :items="desserts"
+        loading-text="加载中..."
+        :loading="loading"
+        class="elevation-1"
+        :items-per-page="50"
+      >
+        <template v-slot:item.account="{ item }">
+          {{ item.accountObj.username }}[{{ item.accountObj.name }}]
+        </template>
+        <template v-slot:item.deviceName="{ item }">
+          {{ item.deviceBrand }}
+        </template>
+        <template v-slot:item.option="{item}">
+          <v-btn elevation="0" tile @click="unBoundingDialogOpen(item)" dark color="red" class="mr-2">
+            <v-icon left>
+              mdi-alert-remove
+            </v-icon>
+            解绑
+          </v-btn>
+        </template>
+      </v-data-table>
+    </v-card>
+    <CommonDialog
+      title="确认解绑设备?"
+      ref="unBoundingDialog"
+      v-on:done="unBoundingDone"
+    ></CommonDialog>
+    <!--    <RoleAuthDialog v-on:done="search" :roles="roles" :user="currentUser" ref="roleDialog"></permissionAuthDialog>-->
+  </v-container>
+</template>
+
+<script>
+// import RoleAuthDialog from '../../components/dialog/permissionAuthDialog'
+// import CommonForm from '../../components/dialog/CommonForm'
+import CommonDialog from '../../components/dialog/CommonDialog'
+import request from '../../axios/request'
+import CommonQueryCard from '../../components/dialog/CommonQueryCard.vue'
+import Device from '../../data/system/device/Device'
+
+export default {
+  name: 'Device',
+  components: {
+    CommonQueryCard,
+    // RoleAuthDialog,
+    CommonDialog
+  },
+  data () {
+    return {
+      show: false,
+      headers: [
+        {
+          text: 'uuid',
+          align: 'center',
+          sortable: false,
+          value: 'uuid'
+        },
+        {
+          text: '所属用户',
+          align: 'center',
+          sortable: false,
+          value: 'account'
+        },
+        {
+          text: '手机型号',
+          align: 'center',
+          sortable: false,
+          value: 'deviceName'
+        },
+        {
+          text: 'IMEI标识',
+          align: 'center',
+          sortable: false,
+          value: 'androidId'
+        },
+        {
+          text: '注册时间',
+          align: 'center',
+          sortable: false,
+          value: 'registerAt'
+        },
+        {
+          text: '操作',
+          align: 'center',
+          sortable: false,
+          value: 'option'
+        }
+      ],
+      desserts: [],
+      loading: true,
+      query: {
+        username: ''
+      },
+      temp: null,
+      type: 'add',
+      formModel: [
+        {
+          code: 'packageName',
+          name: '包名',
+          formType: 'text',
+          value: '',
+          notNull: true,
+          option: [],
+          col: 6
+        },
+        {
+          code: 'name',
+          name: 'App名称',
+          formType: 'text',
+          value: '',
+          notNull: true,
+          option: [],
+          col: 6
+        },
+        {
+          code: 'supportVersion',
+          name: '支持版本',
+          formType: 'json',
+          mode: 'text',
+          value: '',
+          notNull: true,
+          option: [],
+          col: 6
+        }
+      ],
+      file: null,
+      importLoading: false,
+      queryModel: Device.queryModel
+    }
+  },
+  methods: {
+    unBoundingDialogOpen (item) {
+      this.temp = item
+      this.$refs.unBoundingDialog.show()
+    },
+    unBoundingDone () {
+      request({
+        url: '/api/unBundleDevice/' + this.temp.uuid,
+        method: 'get'
+      })
+        .then((resp) => {
+          this.search(null)
+          this.$refs.unBoundingDialog.close()
+        })
+        .catch((resp) => {
+
+        })
+    },
+
+    search (params) {
+      if (!this.$util.isNullOrUndefined(params)) {
+        this.$util.replaceNull(params)
+        this.query = params
+      }
+      this.loading = true
+      request({
+        url: '/device/search',
+        method: 'get',
+        params: {
+          userId: this.query.username
+        }
+      })
+        .then((resp) => {
+          this.loading = false
+          this.desserts = resp.data
+        })
+        .catch((resp) => {
+
+        })
+    }
+  },
+  created () {
+    this.search()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

dtok-vue/src/views/base/Script.vue

@@ -21,6 +21,7 @@
         loading-text="加载中..."
         :loading="loading"
         class="elevation-1"
+        :items-per-page="50"
       >
         <template v-slot:item.app="{item}">
           {{ item.appInfo.name }}
@@ -156,6 +157,12 @@ export default {
           sortable: false,
           value: 'callCount'
         },
+        {
+          text: '版本',
+          align: 'center',
+          sortable: false,
+          value: 'version'
+        },
         {
           text: '操作',
           align: 'center',

dtok-vue/src/views/base/editor/ChangeVersion.vue

@@ -18,9 +18,9 @@
 
       <v-spacer></v-spacer>
 
-      <v-btn icon>
-        <v-icon>mdi-cloud-sync</v-icon>
-      </v-btn>
+<!--      <v-btn icon>-->
+<!--        <v-icon>mdi-cloud-sync</v-icon>-->
+<!--      </v-btn>-->
 
       <v-btn @click="changeVersion" icon>
         <v-icon>mdi-git</v-icon>

dtok-vue/src/views/layout/AppDrawer.vue

@@ -53,7 +53,7 @@
                   </v-list-item-icon>
                 </template>
                 <template v-else>
-                  <v-icon>{{ subItem.icon }}</v-icon>
+                  <v-icon>{{ subItem.icon }}</v-icon>&nbsp;
                   <v-list-item-content>
                     <v-list-item-title
                       v-text="

dtok-vue/vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
     open: true,
     /* 设置为0.0.0.0则所有的地址均能访问 */
     host: '0.0.0.0',
-    port: 8080,
+    port: 8081,
     https: false,
     hotOnly: false,
     proxy: {