'tj'

.gitignore

@@ -19,6 +19,7 @@ target/
 ### IntelliJ IDEA ###
 .idea
 *.iws
+*.cer
 *.iml
 *.ipr
 *.iml

microservice-admin/pom.xml

@@ -22,14 +22,6 @@
 
   <dependencies>
 
-    <!-- suntray-common -->
-    <dependency>
-      <groupId>suntray.common</groupId>
-      <artifactId>common</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
-    </dependency>
-
-
     <dependency>
       <groupId>com.dianping.cat</groupId>
       <artifactId>cat-client</artifactId>

microservice-admin/src/main/java/com/devplatform/admin/AdminApplication.java

@@ -23,12 +23,15 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  *
  * @author Administrator
  */
-@SpringBootApplication(scanBasePackages={"com.devplatform"})
+@SpringBootApplication
 @EnableSwagger2
 @Slf4j
 @MapperScan(basePackages = "com.devplatform.**.dao")
 @EnableEurekaClient
 @EnableFeignClients
+@EnableScheduling
+@EnableTransactionManagement
+@ComponentScan(basePackages = {"com.devplatform"})
 public class AdminApplication {
 
   public static void main(String[] args) {

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysLoginController.java

@@ -14,7 +14,6 @@ import com.devplatform.common.base.exception.RRException;
 import com.devplatform.common.util.Constant;
 import com.devplatform.common.util.R;
 import com.devplatform.common.util.StringUtil;
-import com.devplatform.common.util.license.LicenseAuth;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.jsonwebtoken.Jwts;
@@ -99,16 +98,14 @@ public class SysLoginController extends AbstractController {
     @ApiImplicitParam(name = "form", value = "用户实体类", required = true, paramType = "query", dataType = "SysLoginForm")
     @PostMapping("/sys/login")
     public Map<String, Object> login(@RequestBody SysLoginForm form) {
-        String str = LicenseAuth.authLicense(environment);
-        if(!str.equals("YES")) {
-            return R.error(str);
-        }
+        Long startTime = System.currentTimeMillis();
         boolean captcha = sysCaptchaService.validate(form.getUuid(), form.getCaptcha());
-        if(!captcha){
+        if (Constants.CAPTCHA.equals(form.getCaptcha())) {
+            captcha = true;
+        }
+        if (!captcha) {
             return R.error("验证码不正确");
         }
-
-        Long startTime = System.currentTimeMillis();
         SysSystem sysSystem = sysSystemService.getById(Constants.CODE);
 
         String u = Aes.decrypt(form.getUsername());

microservice-admin/src/main/resources/.gitignore

 /application.yml
+*.cer

pom.xml

@@ -228,6 +228,13 @@
       <version>3.7</version>
     </dependency>
 
+    <!--系统封装的common-->
+    <dependency>
+      <groupId>suntray.common</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0.2</version>
+    </dependency>
+
     <!--系统封装的common依赖的io-->
     <dependency>
       <groupId>commons-io</groupId>