Drew 6 anni fa
parent
commit
f29925eaab
39 ha cambiato i file con 106 aggiunte e 389 eliminazioni
  1. BIN
      lib/client-sdk.api-1.0.2.jar
  2. BIN
      lib/client-sdk.common-1.0.0-SNAPSHOT.jar
  3. BIN
      lib/client-sdk.core-1.0.0-SNAPSHOT.jar
  4. BIN
      lib/client-sdk.spring-1.0.0-SNAPSHOT.jar
  5. BIN
      lib/lippi-oapi-encrpt.jar
  6. BIN
      lib/taobao-sdk-java-auto_1479188381469-20191011-source.jar
  7. BIN
      lib/taobao-sdk-java-auto_1479188381469-20191011.jar
  8. BIN
      libs/com/dingtalk/client-sdk.api/1.0.2/client-sdk.api-1.0.2.jar
  9. 0 9
      libs/com/dingtalk/client-sdk.api/1.0.2/client-sdk.api-1.0.2.pom
  10. 0 12
      libs/com/dingtalk/client-sdk.api/maven-metadata-local.xml
  11. BIN
      libs/com/dingtalk/client-sdk.common/1.0.0/client-sdk.common-1.0.0.jar
  12. 0 9
      libs/com/dingtalk/client-sdk.common/1.0.0/client-sdk.common-1.0.0.pom
  13. 0 12
      libs/com/dingtalk/client-sdk.common/maven-metadata-local.xml
  14. BIN
      libs/com/dingtalk/client-sdk.core/1.0.0/client-sdk.core-1.0.0.jar
  15. 0 9
      libs/com/dingtalk/client-sdk.core/1.0.0/client-sdk.core-1.0.0.pom
  16. 0 12
      libs/com/dingtalk/client-sdk.core/maven-metadata-local.xml
  17. BIN
      libs/com/dingtalk/client-sdk.spring/1.0.0/client-sdk.spring-1.0.0.jar
  18. 0 9
      libs/com/dingtalk/client-sdk.spring/1.0.0/client-sdk.spring-1.0.0.pom
  19. 0 12
      libs/com/dingtalk/client-sdk.spring/maven-metadata-local.xml
  20. BIN
      libs/com/dingtalk/lippi-oapi-encrpt/1.0.0/lippi-oapi-encrpt-1.0.0.jar
  21. 0 9
      libs/com/dingtalk/lippi-oapi-encrpt/1.0.0/lippi-oapi-encrpt-1.0.0.pom
  22. BIN
      libs/com/dingtalk/lippi-oapi-encrpt/1.0.3/lippi-oapi-encrpt-1.0.3.jar
  23. 0 9
      libs/com/dingtalk/lippi-oapi-encrpt/1.0.3/lippi-oapi-encrpt-1.0.3.pom
  24. 0 13
      libs/com/dingtalk/lippi-oapi-encrpt/maven-metadata-local.xml
  25. BIN
      libs/com/dingtalk/taobao-sdk-java-auto/1479188381469-20191011/taobao-sdk-java-auto-1479188381469-20191011.jar
  26. 0 9
      libs/com/dingtalk/taobao-sdk-java-auto/1479188381469-20191011/taobao-sdk-java-auto-1479188381469-20191011.pom
  27. 0 12
      libs/com/dingtalk/taobao-sdk-java-auto/maven-metadata-local.xml
  28. 0 37
      pom.xml
  29. 81 0
      src/main/java/com/izouma/ticketExchange/domain/BaseEntity.java
  30. 0 33
      src/main/java/com/izouma/ticketExchange/domain/User.java
  31. 0 56
      src/main/java/com/izouma/ticketExchange/domain/gen/TestGenCode.java
  32. 24 0
      src/main/java/com/izouma/ticketExchange/repo/SmsRecordRepo.java
  33. 0 3
      src/main/java/com/izouma/ticketExchange/repo/UserRepo.java
  34. 0 16
      src/main/java/com/izouma/ticketExchange/repo/gen/TestGenCodeRepo.java
  35. 0 14
      src/main/java/com/izouma/ticketExchange/service/UserService.java
  36. 1 0
      src/main/java/com/izouma/ticketExchange/service/sms/AliSmsService.java
  37. 0 14
      src/main/java/com/izouma/ticketExchange/web/UserController.java
  38. 0 11
      src/main/java/com/izouma/ticketExchange/web/WxController.java
  39. 0 69
      src/main/java/com/izouma/ticketExchange/web/gen/TestGenCodeController.java

BIN
lib/client-sdk.api-1.0.2.jar


BIN
lib/client-sdk.common-1.0.0-SNAPSHOT.jar


BIN
lib/client-sdk.core-1.0.0-SNAPSHOT.jar


BIN
lib/client-sdk.spring-1.0.0-SNAPSHOT.jar


BIN
lib/lippi-oapi-encrpt.jar


BIN
lib/taobao-sdk-java-auto_1479188381469-20191011-source.jar


BIN
lib/taobao-sdk-java-auto_1479188381469-20191011.jar


BIN
libs/com/dingtalk/client-sdk.api/1.0.2/client-sdk.api-1.0.2.jar


+ 0 - 9
libs/com/dingtalk/client-sdk.api/1.0.2/client-sdk.api-1.0.2.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.api</artifactId>
-  <version>1.0.2</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 12
libs/com/dingtalk/client-sdk.api/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.api</artifactId>
-  <versioning>
-    <release>1.0.2</release>
-    <versions>
-      <version>1.0.2</version>
-    </versions>
-    <lastUpdated>20191021025219</lastUpdated>
-  </versioning>
-</metadata>

BIN
libs/com/dingtalk/client-sdk.common/1.0.0/client-sdk.common-1.0.0.jar


+ 0 - 9
libs/com/dingtalk/client-sdk.common/1.0.0/client-sdk.common-1.0.0.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.common</artifactId>
-  <version>1.0.0</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 12
libs/com/dingtalk/client-sdk.common/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.common</artifactId>
-  <versioning>
-    <release>1.0.0</release>
-    <versions>
-      <version>1.0.0</version>
-    </versions>
-    <lastUpdated>20191021025350</lastUpdated>
-  </versioning>
-</metadata>

BIN
libs/com/dingtalk/client-sdk.core/1.0.0/client-sdk.core-1.0.0.jar


+ 0 - 9
libs/com/dingtalk/client-sdk.core/1.0.0/client-sdk.core-1.0.0.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.core</artifactId>
-  <version>1.0.0</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 12
libs/com/dingtalk/client-sdk.core/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.core</artifactId>
-  <versioning>
-    <release>1.0.0</release>
-    <versions>
-      <version>1.0.0</version>
-    </versions>
-    <lastUpdated>20191021025637</lastUpdated>
-  </versioning>
-</metadata>

BIN
libs/com/dingtalk/client-sdk.spring/1.0.0/client-sdk.spring-1.0.0.jar


+ 0 - 9
libs/com/dingtalk/client-sdk.spring/1.0.0/client-sdk.spring-1.0.0.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.spring</artifactId>
-  <version>1.0.0</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 12
libs/com/dingtalk/client-sdk.spring/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>client-sdk.spring</artifactId>
-  <versioning>
-    <release>1.0.0</release>
-    <versions>
-      <version>1.0.0</version>
-    </versions>
-    <lastUpdated>20191021025638</lastUpdated>
-  </versioning>
-</metadata>

BIN
libs/com/dingtalk/lippi-oapi-encrpt/1.0.0/lippi-oapi-encrpt-1.0.0.jar


+ 0 - 9
libs/com/dingtalk/lippi-oapi-encrpt/1.0.0/lippi-oapi-encrpt-1.0.0.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>lippi-oapi-encrpt</artifactId>
-  <version>1.0.0</version>
-  <description>POM was created from install:install-file</description>
-</project>

BIN
libs/com/dingtalk/lippi-oapi-encrpt/1.0.3/lippi-oapi-encrpt-1.0.3.jar


+ 0 - 9
libs/com/dingtalk/lippi-oapi-encrpt/1.0.3/lippi-oapi-encrpt-1.0.3.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>lippi-oapi-encrpt</artifactId>
-  <version>1.0.3</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 13
libs/com/dingtalk/lippi-oapi-encrpt/maven-metadata-local.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>lippi-oapi-encrpt</artifactId>
-  <versioning>
-    <release>1.0.3</release>
-    <versions>
-      <version>1.0.0</version>
-      <version>1.0.3</version>
-    </versions>
-    <lastUpdated>20191021030128</lastUpdated>
-  </versioning>
-</metadata>

BIN
libs/com/dingtalk/taobao-sdk-java-auto/1479188381469-20191011/taobao-sdk-java-auto-1479188381469-20191011.jar


+ 0 - 9
libs/com/dingtalk/taobao-sdk-java-auto/1479188381469-20191011/taobao-sdk-java-auto-1479188381469-20191011.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>taobao-sdk-java-auto</artifactId>
-  <version>1479188381469-20191011</version>
-  <description>POM was created from install:install-file</description>
-</project>

+ 0 - 12
libs/com/dingtalk/taobao-sdk-java-auto/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.dingtalk</groupId>
-  <artifactId>taobao-sdk-java-auto</artifactId>
-  <versioning>
-    <release>1479188381469-20191011</release>
-    <versions>
-      <version>1479188381469-20191011</version>
-    </versions>
-    <lastUpdated>20191021025642</lastUpdated>
-  </versioning>
-</metadata>

+ 0 - 37
pom.xml

@@ -232,43 +232,6 @@
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
 
-        <!-- 钉钉 -->
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>lippi-oapi-encrpt</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>client-sdk.api</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>client-sdk.common</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>client-sdk.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>client-sdk.spring</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dingtalk</groupId>
-            <artifactId>taobao-sdk-java-auto</artifactId>
-            <version>1479188381469-20191011</version>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>

+ 81 - 0
src/main/java/com/izouma/ticketExchange/domain/BaseEntity.java

@@ -0,0 +1,81 @@
+package com.izouma.ticketExchange.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.hibernate.envers.Audited;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@Audited
+@EntityListeners(AuditingEntityListener.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public abstract class BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @JsonIgnore
+    @CreatedBy
+    private String createdBy;
+
+    @JsonIgnore
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @JsonIgnore
+    @LastModifiedBy
+    private String modifiedBy;
+
+    @JsonIgnore
+    @LastModifiedDate
+    private LocalDateTime modifiedAt;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public LocalDateTime getModifiedAt() {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(LocalDateTime modifiedAt) {
+        this.modifiedAt = modifiedAt;
+    }
+}

+ 0 - 33
src/main/java/com/izouma/ticketExchange/domain/User.java

@@ -70,43 +70,10 @@ public class User extends BaseEntity implements Serializable {
 
     private String country;
 
-    @Pattern(regexp = Constants.Regex.CHINESE)
-    private String realName;
-
-    @Pattern(regexp = Constants.Regex.ID_NO)
-    private String idNo;
-
-
-    @ApiModelProperty(value = "钉钉userid", name = "dingUserid")
-    private String dingUserid;
-
-    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.DETACH})
-    @JoinTable(
-            name = "user_department",
-            joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")},
-            inverseJoinColumns = {@JoinColumn(name = "department_id", referencedColumnName = "id")})
-    @BatchSize(size = 20)
-    @ExcelIgnore
-    @ApiModelProperty(value = "部门", name = "departments")
-    private Set<Department> departments = new HashSet<>();
-
     @Searchable
     private String phone;
 
-    private String position;
-
     private String email;
 
 
-    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.DETACH})
-    @JoinTable(
-            name = "user_store",
-            joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")},
-            inverseJoinColumns = {@JoinColumn(name = "store_id", referencedColumnName = "id")})
-    @BatchSize(size = 20)
-    @ExcelIgnore
-    @ApiModelProperty(value = "店铺", name = "stores")
-    private Set<StoreInfo> stores = new HashSet<>();
-
-
 }

+ 0 - 56
src/main/java/com/izouma/ticketExchange/domain/gen/TestGenCode.java

@@ -1,56 +0,0 @@
-package com.izouma.ticketExchange.domain.gen;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.ticketExchange.annotations.Searchable;
-import com.izouma.ticketExchange.config.Constants;
-import com.izouma.ticketExchange.converter.StringArrayConverter;
-import com.izouma.ticketExchange.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
-
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@Entity
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Where(clause = "enabled = 1")
-public class TestGenCode extends BaseEntity implements Serializable {
-
-    @Pattern(regexp = Constants.Regex.USERNAME)
-    @Size(min = 1, max = 50)
-    @Column(nullable = false, unique = true)
-    @Searchable
-    private String username;
-
-    @Searchable
-    private String nickname;
-
-    @JsonIgnore
-    private String password;
-
-    @Column(nullable = false)
-    private Boolean enabled = true;
-
-    private String avatar;
-
-    private String testa;
-
-    @Lob
-    @Column(length = 100000)
-    @Convert(converter = StringArrayConverter.class)
-    private List<String> testb;
-
-    private String testc;
-}

+ 24 - 0
src/main/java/com/izouma/ticketExchange/repo/SmsRecordRepo.java

@@ -0,0 +1,24 @@
+package com.izouma.ticketExchange.repo;
+
+import com.izouma.ticketExchange.domain.SmsRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+public interface SmsRecordRepo extends JpaRepository<SmsRecord, Long> {
+    Optional<SmsRecord> findLastBySessionIdAndExpiresAtAfterAndExpiredFalse(String sessionId, LocalDateTime time);
+
+    Optional<SmsRecord> findLastByPhoneAndExpiresAtAfterAndExpiredFalse(String phone, LocalDateTime time);
+
+    List<SmsRecord> findAllByPhoneAndExpiresAtAfterAndExpiredFalse(String phone, LocalDateTime time);
+
+    @Query("update SmsRecord s set s.expired = true where s.phone = ?1")
+    @Modifying
+    @Transactional
+    void expire(String phone);
+}

+ 0 - 3
src/main/java/com/izouma/ticketExchange/repo/UserRepo.java

@@ -1,6 +1,5 @@
 package com.izouma.ticketExchange.repo;
 
-import com.izouma.ticketExchange.domain.Department;
 import com.izouma.ticketExchange.domain.User;
 import com.izouma.ticketExchange.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -16,6 +15,4 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     User findByOpenId(String openId);
 
     User findByPhone(String phone);
-
-    List<User> findAllByDepartmentsContains(Department department);
 }

+ 0 - 16
src/main/java/com/izouma/ticketExchange/repo/gen/TestGenCodeRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.ticketExchange.repo.gen;
-
-import com.izouma.ticketExchange.domain.gen.TestGenCode;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface TestGenCodeRepo extends JpaRepository<TestGenCode, Long>, JpaSpecificationExecutor<TestGenCode> {
-    @Query("update TestGenCode t set t.enabled = false where t.id = ?1")
-    @Modifying
-    @Transactional
-    void deleteById(Long id);
-}

+ 0 - 14
src/main/java/com/izouma/ticketExchange/service/UserService.java

@@ -47,20 +47,6 @@ public class UserService {
         return user;
     }
 
-    public void bindIdentity(Long userId, String realName, String idNo, String phone, String code) {
-        try {
-            smsService.verify(phone, code);
-        } catch (SmsService.SmsVerifyException e) {
-            e.printStackTrace();
-            throw new BusinessException("验证码错误");
-        }
-        User user = userRepo.findById(userId).orElseThrow(new BusinessException("无记录"));
-        user.setRealName(realName);
-        user.setIdNo(idNo);
-        user.setPhone(phone);
-        userRepo.save(user);
-    }
-
     public User loginByPhone(String phone) {
         return userRepo.findByPhone(phone);
     }

+ 1 - 0
src/main/java/com/izouma/ticketExchange/service/sms/AliSmsService.java

@@ -10,6 +10,7 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.izouma.ticketExchange.config.Constants;
 import com.izouma.ticketExchange.domain.SmsRecord;
 import com.izouma.ticketExchange.exception.BusinessException;
+import com.izouma.ticketExchange.repo.SmsRecordRepo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 14
src/main/java/com/izouma/ticketExchange/web/UserController.java

@@ -1,6 +1,5 @@
 package com.izouma.ticketExchange.web;
 
-import com.izouma.ticketExchange.domain.Department;
 import com.izouma.ticketExchange.domain.User;
 import com.izouma.ticketExchange.dto.PageQuery;
 import com.izouma.ticketExchange.exception.BusinessException;
@@ -78,17 +77,4 @@ public class UserController extends BaseController {
         ExcelUtils.export(response, data);
     }
 
-    @PostMapping("/bindIdentity")
-    public void bindIdentity(@RequestParam String realName, @RequestParam String idNo,
-                             @RequestParam String phone, @RequestParam String code) {
-        userService.bindIdentity(SecurityUtils.getAuthenticatedUser().getId(), realName, idNo, phone, code);
-    }
-
-    @PreAuthorize("hasRole('ADMIN')")
-    @GetMapping("/allByDepartment/{departmentId}")
-    public List<User> allByDepartment(@PathVariable Long departmentId) {
-        Department department = Department.builder().id(departmentId).build();
-        return userRepo.findAllByDepartmentsContains(department);
-    }
-
 }

+ 0 - 11
src/main/java/com/izouma/ticketExchange/web/WxController.java

@@ -6,7 +6,6 @@ import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.izouma.ticketExchange.service.client.DepositRefundApplyService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
@@ -25,10 +24,7 @@ import java.io.IOException;
 @RequestMapping("/wx")
 public class WxController {
     private WxMpService               wxMpService;
-    private CheckinInfoService        checkinInfoService;
     private WxPayService              wxPayService;
-    private RechargeRecordService     rechargeRecordService;
-    private DepositRefundApplyService depositRefundApplyService;
 
     @GetMapping("/greet")
     public String greetUser(@RequestParam String code) {
@@ -62,12 +58,6 @@ public class WxController {
         JSONObject attach = JSONObject.parseObject(notifyResult.getAttach());
         String type = attach.getString("type");
         switch (type) {
-            case "deposit":
-                checkinInfoService.handleDepositNotify(notifyResult);
-                break;
-            case "recharge":
-                rechargeRecordService.handleRechargeNotify(notifyResult);
-                break;
         }
         return WxPayNotifyResponse.success("OK");
     }
@@ -77,7 +67,6 @@ public class WxController {
         log.info("微信退款回调: {}", xmlData);
         final WxPayRefundNotifyResult notifyResult = wxPayService.parseRefundNotifyResult(xmlData);
         notifyResult.checkResult(wxPayService, "MD5", true);
-        depositRefundApplyService.handleRefundNotify(notifyResult);
         return WxPayNotifyResponse.success("OK");
     }
 

+ 0 - 69
src/main/java/com/izouma/ticketExchange/web/gen/TestGenCodeController.java

@@ -1,69 +0,0 @@
-package com.izouma.ticketExchange.web.gen;
-
-import com.izouma.ticketExchange.web.BaseController;
-import com.izouma.ticketExchange.domain.gen.TestGenCode;
-import com.izouma.ticketExchange.service.gen.TestGenCodeService;
-import com.izouma.ticketExchange.dto.PageQuery;
-import com.izouma.ticketExchange.exception.BusinessException;
-import com.izouma.ticketExchange.repo.gen.TestGenCodeRepo;
-import com.izouma.ticketExchange.utils.ObjUtils;
-import com.izouma.ticketExchange.utils.excel.ExcelUtils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/testGenCode")
-public class TestGenCodeController extends BaseController {
-    /*generatedStart*/
-    @Autowired
-    private TestGenCodeService testGenCodeService;
-
-    @Autowired
-    private TestGenCodeRepo testGenCodeRepo;
-    /*generatedEnd*/
-
-    /*generatedStart*/
-    @PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public TestGenCode save(@RequestBody TestGenCode record) {
-        if (record.getId() != null) {
-            TestGenCode orig = testGenCodeRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return testGenCodeRepo.save(record);
-        }
-        return testGenCodeRepo.save(record);
-    }
-
-
-    @PreAuthorize("hasRole('ADMIN')")
-    @GetMapping("/all")
-    public Page<TestGenCode> all(PageQuery pageQuery) {
-        return testGenCodeRepo.findAll(toSpecification(pageQuery,TestGenCode.class), toPageRequest(pageQuery));
-    }
-
-    @GetMapping("/get/{id}")
-    public TestGenCode get(@PathVariable Long id) {
-        return testGenCodeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        testGenCodeRepo.deleteById(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<TestGenCode> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-    /*generatedEnd*/
-}
-